231 files changed, 432 insertions, 472 deletions

diff --git a/client/audio/sound.tscn b/client/audio/sound.tscn
index 49851f9a..b15a3263 100644
--- a/client/audio/sound.tscn
+++ b/client/audio/sound.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=5 format=3 uid="uid://d3h243yic44rr"]
 
 [ext_resource type="Script" uid="uid://cho8r5m78a4ur" path="res://audio/sound.gd" id="1_b0qb1"]
-[ext_resource type="AudioStream" uid="uid://cpyn511c5mtni" path="res://menu/sounds/click.ogg" id="2_mhrce"]
-[ext_resource type="AudioStream" uid="uid://dtr1khfyqr56o" path="res://menu/sounds/hover.ogg" id="3_qft2s"]
-[ext_resource type="AudioStream" uid="uid://dft3m8utnxhs7" path="res://menu/sounds/game_start.ogg" id="4_le874"]
+[ext_resource type="AudioStream" uid="uid://cpyn511c5mtni" path="res://gui/resources/sounds/click.ogg" id="2_mhrce"]
+[ext_resource type="AudioStream" uid="uid://dtr1khfyqr56o" path="res://gui/resources/sounds/hover.ogg" id="3_qft2s"]
+[ext_resource type="AudioStream" uid="uid://dft3m8utnxhs7" path="res://gui/resources/sounds/game_start.ogg" id="4_le874"]
 
 [node name="Sound" type="Node3D"]
 script = ExtResource("1_b0qb1")
diff --git a/client/game.gd b/client/game.gd
index a1b7e538..d89988ff 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -78,7 +78,7 @@ func _ready():
 	mp.packet.connect(handle_packet)
 	mp.connection_closed.connect(func(reason: String):
 		Global.error_message = reason;
-		get_parent().replace_menu("res://menu/error.tscn")
+		get_parent().replace_menu("res://gui/menus/error.tscn")
 	)
 	mp.connect_to_url(menu.data)
 
@@ -287,7 +287,7 @@ func handle_packet(p):
 				if in_lobby:
 					toggle_join()
 				elif not is_replay:
-					menu.submenu("res://menu/ingame.tscn")
+					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)
@@ -317,9 +317,9 @@ func handle_packet(p):
 		"menu":
 			match p.menu:
 				"document":
-					menu.submenu("res://menu/document/document.tscn", p["data"])
+					menu.submenu("res://gui/menus/document/document.tscn", p["data"])
 				"score":
-					menu.submenu("res://menu/rating/rating.tscn", [p.data.stars, p.data.points])
+					menu.submenu("res://gui/menus/rating/rating.tscn", [p.data.stars, p.data.points])
 				"announce_start":
 					overlay.announce_start()
 		"server_message":
@@ -350,7 +350,7 @@ func handle_packet(p):
 		"environment":
 			$Environment.update(p.effects)
 		"redirect":
-			get_parent().replace_menu("res://menu/game.tscn", p.uri[0])
+			get_parent().replace_menu("res://gui/menus/game.tscn", p.uri[0])
 		"replay_start":
 			is_replay = true
 		"replay_stop":
diff --git a/client/menu/auto_setup/blur_setup.gd b/client/gui/components/blur_setup.gd
index 567ac891..567ac891 100644
--- a/client/menu/auto_setup/blur_setup.gd
+++ b/client/gui/components/blur_setup.gd
diff --git a/client/menu/auto_setup/blur_setup.gd.uid b/client/gui/components/blur_setup.gd.uid
index 68ba7335..68ba7335 100644
--- a/client/menu/auto_setup/blur_setup.gd.uid
+++ b/client/gui/components/blur_setup.gd.uid
diff --git a/client/menu/controller_buttons/controller_button.gd b/client/gui/components/controller_button.gd
index 71f1332f..71f1332f 100644
--- a/client/menu/controller_buttons/controller_button.gd
+++ b/client/gui/components/controller_button.gd
diff --git a/client/menu/controller_buttons/controller_button.gd.uid b/client/gui/components/controller_button.gd.uid
index c8f5a86c..c8f5a86c 100644
--- a/client/menu/controller_buttons/controller_button.gd.uid
+++ b/client/gui/components/controller_button.gd.uid
diff --git a/client/menu/communicate/chat/chat_message.gd b/client/gui/components/message/chat_message.gd
index ce3dd0ca..ce3dd0ca 100644
--- a/client/menu/communicate/chat/chat_message.gd
+++ b/client/gui/components/message/chat_message.gd
diff --git a/client/menu/communicate/chat/chat_message.gd.uid b/client/gui/components/message/chat_message.gd.uid
index f1c4ff05..f1c4ff05 100644
--- a/client/menu/communicate/chat/chat_message.gd.uid
+++ b/client/gui/components/message/chat_message.gd.uid
diff --git a/client/menu/communicate/chat/chat_message.tscn b/client/gui/components/message/chat_message.tscn
index 43930670..1478c738 100644
--- a/client/menu/communicate/chat/chat_message.tscn
+++ b/client/gui/components/message/chat_message.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=3 uid="uid://bpc2qgsvcafhe"]
 
-[ext_resource type="Script" uid="uid://6rprqelfdp3" path="res://menu/communicate/chat/chat_message.gd" id="1_ey0qp"]
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_rx6vg"]
+[ext_resource type="Script" uid="uid://6rprqelfdp3" path="res://gui/components/message/chat_message.gd" id="1_ey0qp"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_rx6vg"]
 
 [sub_resource type="FontVariation" id="FontVariation_jfhbh"]
 variation_embolden = 1.3
diff --git a/client/menu/communicate/item/item_message.gd b/client/gui/components/message/item/item_message.gd
index 77429f7b..e643c291 100644
--- a/client/menu/communicate/item/item_message.gd
+++ b/client/gui/components/message/item/item_message.gd
@@ -16,7 +16,7 @@
 class_name ItemMessage
 extends Control
 
-const PRINTED_MAT := preload("res://menu/theme/materials/printed_material.tres")
+const PRINTED_MAT := preload("res://gui/resources/materials/printed_material.tres")
 
 @export var enable_rotation := true
 @export var enable_grayscale := false
diff --git a/client/menu/communicate/item/item_message.gd.uid b/client/gui/components/message/item/item_message.gd.uid
index d2600c43..d2600c43 100644
--- a/client/menu/communicate/item/item_message.gd.uid
+++ b/client/gui/components/message/item/item_message.gd.uid
diff --git a/client/menu/communicate/item/item_message.tscn b/client/gui/components/message/item/item_message.tscn
index 9178afab..59e0ebf9 100644
--- a/client/menu/communicate/item/item_message.tscn
+++ b/client/gui/components/message/item/item_message.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=6 format=3 uid="uid://fkqh36s4vl3p"]
 
-[ext_resource type="Script" uid="uid://boheclidwdafn" path="res://menu/communicate/item/item_message.gd" id="1_76lg0"]
-[ext_resource type="PackedScene" uid="uid://cem5xcld6vn51" path="res://menu/communicate/item/item_render.tscn" id="1_sju7l"]
-[ext_resource type="StyleBox" uid="uid://brw8uogdgx2gf" path="res://menu/theme/style/item_bubble_progress_style.tres" id="3_ipe76"]
-[ext_resource type="StyleBox" uid="uid://cu0his4018e7h" path="res://menu/theme/style/item_bubble_progress_style_background.tres" id="3_t61n3"]
+[ext_resource type="Script" uid="uid://boheclidwdafn" path="res://gui/components/message/item/item_message.gd" id="1_76lg0"]
+[ext_resource type="PackedScene" uid="uid://cem5xcld6vn51" path="res://gui/components/message/item/item_render.tscn" id="1_sju7l"]
+[ext_resource type="StyleBox" uid="uid://brw8uogdgx2gf" path="res://gui/resources/style/item_bubble_progress_style.tres" id="3_ipe76"]
+[ext_resource type="StyleBox" uid="uid://cu0his4018e7h" path="res://gui/resources/style/item_bubble_progress_style_background.tres" id="3_t61n3"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dpele"]
 bg_color = Color(1, 1, 1, 1)
diff --git a/client/menu/communicate/item/item_render.gd b/client/gui/components/message/item/item_render.gd
index 71a5eb7c..71a5eb7c 100644
--- a/client/menu/communicate/item/item_render.gd
+++ b/client/gui/components/message/item/item_render.gd
diff --git a/client/menu/communicate/item/item_render.gd.uid b/client/gui/components/message/item/item_render.gd.uid
index 745b21ce..745b21ce 100644
--- a/client/menu/communicate/item/item_render.gd.uid
+++ b/client/gui/components/message/item/item_render.gd.uid
diff --git a/client/menu/communicate/item/item_render.tscn b/client/gui/components/message/item/item_render.tscn
index 5beb8563..3d993b7a 100644
--- a/client/menu/communicate/item/item_render.tscn
+++ b/client/gui/components/message/item/item_render.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://cem5xcld6vn51"]
 
-[ext_resource type="Script" uid="uid://bt7773og3p557" path="res://menu/communicate/item/item_render.gd" id="1_jfi7o"]
+[ext_resource type="Script" uid="uid://bt7773og3p557" path="res://gui/components/message/item/item_render.gd" id="1_jfi7o"]
 
 [sub_resource type="Environment" id="Environment_iyxrx"]
 ambient_light_source = 2
diff --git a/client/menu/communicate/popup_message/pinned_item_messages.gd b/client/gui/components/message/popup_message/pinned_item_messages.gd
index fdbe015c..fe82f904 100644
--- a/client/menu/communicate/popup_message/pinned_item_messages.gd
+++ b/client/gui/components/message/popup_message/pinned_item_messages.gd
@@ -16,8 +16,8 @@
 extends Control
 class_name PinnedItemMessages
 
-const ITEM_MESSAGE_SCENE := preload("res://menu/communicate/item/item_message.tscn")
-const PAPER_PANEL_STYLE := preload("res://menu/theme/style/paper_panel_style.tres")
+const ITEM_MESSAGE_SCENE := preload("res://gui/components/message/item/item_message.tscn")
+const PAPER_PANEL_STYLE := preload("res://gui/resources/style/paper_panel_style.tres")
 
 var pinned_items := {}
 
diff --git a/client/menu/communicate/popup_message/pinned_item_messages.gd.uid b/client/gui/components/message/popup_message/pinned_item_messages.gd.uid
index 2325c656..2325c656 100644
--- a/client/menu/communicate/popup_message/pinned_item_messages.gd.uid
+++ b/client/gui/components/message/popup_message/pinned_item_messages.gd.uid
diff --git a/client/menu/communicate/popup_message/pinned_item_messages.tscn b/client/gui/components/message/popup_message/pinned_item_messages.tscn
index 6d771853..30f27809 100644
--- a/client/menu/communicate/popup_message/pinned_item_messages.tscn
+++ b/client/gui/components/message/popup_message/pinned_item_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://menu/communicate/popup_message/pinned_item_messages.gd" id="1_q0jkk"]
+[ext_resource type="Script" uid="uid://c0k6f1wkynbkd" path="res://gui/components/message/popup_message/pinned_item_messages.gd" id="1_q0jkk"]
 
 [node name="PinnedItemMessages" type="Control"]
 layout_mode = 3
diff --git a/client/menu/communicate/popup_message/popup_message.gd b/client/gui/components/message/popup_message/popup_message.gd
index 7cefcdd9..ae474914 100644
--- a/client/menu/communicate/popup_message/popup_message.gd
+++ b/client/gui/components/message/popup_message/popup_message.gd
@@ -16,7 +16,7 @@
 extends Control
 class_name PopupMessage
 
-const SERVER_MESSAGE_SCENE = preload("res://menu/communicate/popup_message/server_message.tscn")
+const SERVER_MESSAGE_SCENE = preload("res://gui/components/message/popup_message/server_message.tscn")
 
 var is_ingame := false
 var is_joined := false
diff --git a/client/menu/communicate/popup_message/popup_message.gd.uid b/client/gui/components/message/popup_message/popup_message.gd.uid
index d9aa95c5..d9aa95c5 100644
--- a/client/menu/communicate/popup_message/popup_message.gd.uid
+++ b/client/gui/components/message/popup_message/popup_message.gd.uid
diff --git a/client/menu/communicate/popup_message/popup_message.tscn b/client/gui/components/message/popup_message/popup_message.tscn
index 4ca5b3c5..0f1bfcec 100644
--- a/client/menu/communicate/popup_message/popup_message.tscn
+++ b/client/gui/components/message/popup_message/popup_message.tscn
@@ -1,12 +1,12 @@
 [gd_scene load_steps=12 format=3 uid="uid://b21nrnkygiyjt"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_a1566"]
-[ext_resource type="Script" uid="uid://c2cx41lrgf5b0" path="res://menu/communicate/popup_message/popup_message.gd" id="2_sbew6"]
-[ext_resource type="Shader" uid="uid://cwldxegcj55if" path="res://menu/theme/shaders/blur_mix.gdshader" id="3_2vnom"]
-[ext_resource type="PackedScene" uid="uid://dq61p3a8og2b6" path="res://menu/communicate/popup_message/server_message.tscn" id="3_m3rok"]
-[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://menu/auto_setup/blur_setup.gd" id="4_pvwmw"]
-[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/fonts/font-azaret-mono.woff2" id="4_wsrnf"]
-[ext_resource type="Texture2D" uid="uid://b2uv5rf0enikf" path="res://menu/icons/hint.svg" id="5_2dxsd"]
+[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="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="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"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_k0m35"]
 shader = ExtResource("3_2vnom")
diff --git a/client/menu/communicate/popup_message/server_message.gd b/client/gui/components/message/popup_message/server_message.gd
index c3fc0a78..a0688dc5 100644
--- a/client/menu/communicate/popup_message/server_message.gd
+++ b/client/gui/components/message/popup_message/server_message.gd
@@ -1,8 +1,8 @@
 extends BlurSetup
 class_name ServerMessage
 
-const DEFAULT_FONT = preload("res://menu/theme/fonts/font-josefin-sans.woff2")
-const MONOSPACE_FONT = preload("res://menu/theme/fonts/font-azaret-mono.woff2")
+const DEFAULT_FONT = preload("res://gui/resources/fonts/font-josefin-sans.woff2")
+const MONOSPACE_FONT = preload("res://gui/resources/fonts/font-azaret-mono.woff2")
 
 @onready var label: Label = $CenterContainer/Label
 
diff --git a/client/menu/communicate/popup_message/server_message.gd.uid b/client/gui/components/message/popup_message/server_message.gd.uid
index 775979e0..775979e0 100644
--- a/client/menu/communicate/popup_message/server_message.gd.uid
+++ b/client/gui/components/message/popup_message/server_message.gd.uid
diff --git a/client/menu/communicate/popup_message/server_message.tscn b/client/gui/components/message/popup_message/server_message.tscn
index 296970b4..fd128666 100644
--- a/client/menu/communicate/popup_message/server_message.tscn
+++ b/client/gui/components/message/popup_message/server_message.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=8 format=3 uid="uid://dq61p3a8og2b6"]
 
-[ext_resource type="Shader" uid="uid://cwldxegcj55if" path="res://menu/theme/shaders/blur_mix.gdshader" id="1_qv8ew"]
-[ext_resource type="Script" uid="uid://dfgwh7x7sqc21" path="res://menu/communicate/popup_message/server_message.gd" id="2_csqo8"]
-[ext_resource type="FontFile" uid="uid://bk704sc5gkrb3" path="res://menu/theme/fonts/font-azaret-mono.woff2" id="3_dw20j"]
+[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="FontFile" uid="uid://bk704sc5gkrb3" path="res://gui/resources/fonts/font-azaret-mono.woff2" id="3_dw20j"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_q3bbd"]
 shader = ExtResource("1_qv8ew")
diff --git a/client/menu/smart_margin_container.gd b/client/gui/components/smart_margin_container.gd
index 046dc6f3..046dc6f3 100644
--- a/client/menu/smart_margin_container.gd
+++ b/client/gui/components/smart_margin_container.gd
diff --git a/client/menu/smart_margin_container.gd.uid b/client/gui/components/smart_margin_container.gd.uid
index c5246aed..c5246aed 100644
--- a/client/menu/smart_margin_container.gd.uid
+++ b/client/gui/components/smart_margin_container.gd.uid
diff --git a/client/menu/auto_setup/scroll_container_custom.gd b/client/gui/components/touch_scroll_container.gd
index 41aa34c0..41aa34c0 100644
--- a/client/menu/auto_setup/scroll_container_custom.gd
+++ b/client/gui/components/touch_scroll_container.gd
diff --git a/client/menu/auto_setup/scroll_container_custom.gd.uid b/client/gui/components/touch_scroll_container.gd.uid
index 56b74a3d..56b74a3d 100644
--- a/client/menu/auto_setup/scroll_container_custom.gd.uid
+++ b/client/gui/components/touch_scroll_container.gd.uid
diff --git a/client/menu/character.gd b/client/gui/menus/character.gd
index 4661b222..3c1230ae 100644
--- a/client/menu/character.gd
+++ b/client/gui/menus/character.gd
@@ -59,7 +59,7 @@ func exit():
 		var accept_button := Button.new()
 		accept_button.text = tr("c.menu.accept")
 		popup_data.buttons = [accept_button]
-		await submenu("res://menu/popup.tscn", popup_data)
+		await submenu("res://gui/menus/popup.tscn", popup_data)
 		return
 	Global.set_profile("username", username_edit.text)
 	Global.save_profile()
diff --git a/client/menu/character.gd.uid b/client/gui/menus/character.gd.uid
index d0df5488..d0df5488 100644
--- a/client/menu/character.gd.uid
+++ b/client/gui/menus/character.gd.uid
diff --git a/client/menu/character.tscn b/client/gui/menus/character.tscn
index b4f05fe2..7bdf03e6 100644
--- a/client/menu/character.tscn
+++ b/client/gui/menus/character.tscn
@@ -1,14 +1,14 @@
 [gd_scene load_steps=11 format=3 uid="uid://1f7xpirm5d28"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_ak2pw"]
-[ext_resource type="Script" uid="uid://bglusga8l5c27" path="res://menu/character.gd" id="1_brhd1"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_ak2pw"]
+[ext_resource type="Script" uid="uid://bglusga8l5c27" path="res://gui/menus/character.gd" id="1_brhd1"]
 [ext_resource type="PackedScene" uid="uid://b4gone8fu53r7" path="res://map/map.tscn" id="3_6mc88"]
 [ext_resource type="PackedScene" uid="uid://b3hhir2fvnunu" path="res://player/character/character.tscn" id="3_odq7n"]
-[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_c0ocf"]
-[ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://menu/icons/arrow.svg" id="5_kvd7k"]
-[ext_resource type="Texture2D" uid="uid://j75dbytlbju" path="res://menu/icons/arrow_pressed.svg" id="5_xpff8"]
-[ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://menu/icons/arrow_hover.svg" id="6_soj8g"]
-[ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://menu/icons/arrow_focus.svg" id="6_u31hl"]
+[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://gui/menus/transition/scene_transition.tscn" id="4_c0ocf"]
+[ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://gui/resources/icons/arrow.svg" id="5_kvd7k"]
+[ext_resource type="Texture2D" uid="uid://j75dbytlbju" path="res://gui/resources/icons/arrow_pressed.svg" id="5_xpff8"]
+[ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://gui/resources/icons/arrow_hover.svg" id="6_soj8g"]
+[ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://gui/resources/icons/arrow_focus.svg" id="6_u31hl"]
 
 [sub_resource type="Environment" id="Environment_ex25y"]
 background_mode = 1
diff --git a/client/menu/communicate/chat/chat_open.gd b/client/gui/menus/chat.gd
index 150b0e7e..150b0e7e 100644
--- a/client/menu/communicate/chat/chat_open.gd
+++ b/client/gui/menus/chat.gd
diff --git a/client/menu/communicate/chat/chat_open.gd.uid b/client/gui/menus/chat.gd.uid
index 672792c0..672792c0 100644
--- a/client/menu/communicate/chat/chat_open.gd.uid
+++ b/client/gui/menus/chat.gd.uid
diff --git a/client/menu/communicate/chat/chat_open.tscn b/client/gui/menus/chat.tscn
index f161f210..626038f4 100644
--- a/client/menu/communicate/chat/chat_open.tscn
+++ b/client/gui/menus/chat.tscn
@@ -1,11 +1,11 @@
 [gd_scene load_steps=7 format=3 uid="uid://dbd6k56l4p0ls"]
 
-[ext_resource type="Script" uid="uid://cfweimyoq5vv0" path="res://menu/communicate/chat/chat_open.gd" id="1_dsl4a"]
-[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="1_isqmk"]
-[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://menu/auto_setup/blur_setup.gd" id="2_urbd2"]
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="3_v7xmg"]
-[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="4_ew1yx"]
-[ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://menu/auto_setup/scroll_container_custom.gd" id="5_3mths"]
+[ext_resource type="Script" uid="uid://cfweimyoq5vv0" path="res://gui/menus/chat.gd" id="1_gntkb"]
+[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://gui/resources/materials/dark_blur_material.tres" id="2_1au48"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="3_lrbjr"]
+[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://gui/resources/style/panel_style_sidebar.tres" id="4_d4nta"]
+[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://gui/components/blur_setup.gd" id="5_l1coj"]
+[ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://gui/components/touch_scroll_container.gd" id="6_ff15x"]
 
 [node name="ChatOpen" type="Control"]
 layout_mode = 3
@@ -13,19 +13,20 @@ anchors_preset = 9
 anchor_bottom = 1.0
 offset_right = 296.0
 grow_vertical = 2
-script = ExtResource("1_dsl4a")
+script = ExtResource("1_gntkb")
 support_anim = false
+auto_anim = null
 
 [node name="PanelContainer" type="PanelContainer" parent="."]
-material = ExtResource("1_isqmk")
+material = ExtResource("2_1au48")
 layout_mode = 1
 anchors_preset = 9
 anchor_bottom = 1.0
 offset_right = 296.0
 grow_vertical = 2
-theme = ExtResource("3_v7xmg")
-theme_override_styles/panel = ExtResource("4_ew1yx")
-script = ExtResource("2_urbd2")
+theme = ExtResource("3_lrbjr")
+theme_override_styles/panel = ExtResource("4_d4nta")
+script = ExtResource("5_l1coj")
 
 [node name="MarginContainer" type="MarginContainer" parent="PanelContainer"]
 layout_mode = 2
@@ -37,11 +38,11 @@ size_flags_vertical = 3
 theme_override_constants/separation = 0
 
 [node name="ScrollContainerCustom" type="ScrollContainer" parent="PanelContainer/MarginContainer/VBoxContainer"]
-material = ExtResource("1_isqmk")
+material = ExtResource("2_1au48")
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
-script = ExtResource("5_3mths")
+script = ExtResource("6_ff15x")
 auto_scroll_to_bottom = true
 
 [node name="Messages" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer/ScrollContainerCustom"]
diff --git a/client/menu/document/document.gd b/client/gui/menus/document/document.gd
index c7042852..c7042852 100644
--- a/client/menu/document/document.gd
+++ b/client/gui/menus/document/document.gd
diff --git a/client/menu/document/document.gd.uid b/client/gui/menus/document/document.gd.uid
index c84b53b1..c84b53b1 100644
--- a/client/menu/document/document.gd.uid
+++ b/client/gui/menus/document/document.gd.uid
diff --git a/client/menu/document/document.tscn b/client/gui/menus/document/document.tscn
index ce39dcbc..537ac8b8 100644
--- a/client/menu/document/document.tscn
+++ b/client/gui/menus/document/document.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://bdggwo8un3mys"]
 
-[ext_resource type="Script" uid="uid://c83p4k0nredmd" path="res://menu/document/document.gd" id="1_gyisx"]
-[ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://menu/auto_setup/scroll_container_custom.gd" id="2_0d0p0"]
+[ext_resource type="Script" uid="uid://c83p4k0nredmd" path="res://gui/menus/document/document.gd" id="1_gyisx"]
+[ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://gui/components/touch_scroll_container.gd" id="2_0d0p0"]
 
 [node name="Document" type="Control"]
 layout_mode = 3
@@ -12,6 +12,7 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_gyisx")
 support_anim = false
+auto_anim = null
 
 [node name="ScrollContainer" type="ScrollContainer" parent="."]
 layout_mode = 1
diff --git a/client/menu/entry.gd b/client/gui/menus/entry.gd
index ac16f808..91bec795 100644
--- a/client/menu/entry.gd
+++ b/client/gui/menus/entry.gd
@@ -22,11 +22,11 @@ func _ready():
 
 	var args = OS.get_cmdline_user_args()
 	if args.size() == 1:
-		await submenu("res://menu/game.tscn", args[0])
+		await submenu("res://gui/menus/game.tscn", args[0])
 	elif not Global.get_setting("gameplay.setup_completed"):
-		await submenu("res://menu/setup.tscn")
+		await submenu("res://gui/menus/setup/setup.tscn")
 	else:
-		await submenu("res://menu/main.tscn")
+		await submenu("res://gui/menus/main/main.tscn")
 
 	print("Menu stack empty, quitting game.")
 	get_tree().quit()
diff --git a/client/menu/entry.gd.uid b/client/gui/menus/entry.gd.uid
index 4bd126a6..4bd126a6 100644
--- a/client/menu/entry.gd.uid
+++ b/client/gui/menus/entry.gd.uid
diff --git a/client/menu/entry.tscn b/client/gui/menus/entry.tscn
index 4c2114e2..f4eced3e 100644
--- a/client/menu/entry.tscn
+++ b/client/gui/menus/entry.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://cd52sr1cmo8oj"]
 
-[ext_resource type="Script" uid="uid://yxaynnimyxgr" path="res://menu/entry.gd" id="1_kibw2"]
+[ext_resource type="Script" uid="uid://yxaynnimyxgr" path="res://gui/menus/entry.gd" id="1_kibw2"]
 
 [node name="Entry" type="Control"]
 layout_mode = 3
diff --git a/client/menu/error.gd b/client/gui/menus/error.gd
index 0630b38c..e11812d5 100644
--- a/client/menu/error.gd
+++ b/client/gui/menus/error.gd
@@ -20,4 +20,4 @@ func _ready():
 	$Panel/SmartMarginContainer/contents/mesage.text = Global.error_message
 
 func _on_return_pressed():
-	replace_menu("res://menu/main.tscn")
+	replace_menu("res://gui/menus/main/main.tscn")
diff --git a/client/menu/error.gd.uid b/client/gui/menus/error.gd.uid
index 20a67804..20a67804 100644
--- a/client/menu/error.gd.uid
+++ b/client/gui/menus/error.gd.uid
diff --git a/client/menu/error.tscn b/client/gui/menus/error.tscn
index f999429d..dcebf322 100644
--- a/client/menu/error.tscn
+++ b/client/gui/menus/error.tscn
@@ -1,11 +1,11 @@
 [gd_scene load_steps=7 format=3 uid="uid://cimgn07lbcs4v"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_cabdu"]
-[ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="2_5fxol"]
-[ext_resource type="Script" uid="uid://bl0n4atrdcogm" path="res://menu/error.gd" id="2_dbe41"]
-[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://menu/scene_transition.tscn" id="4_1nbt3"]
-[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="4_hxkkd"]
-[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://menu/smart_margin_container.gd" id="5_rfcg2"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_cabdu"]
+[ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://gui/menus/main/background.tscn" id="2_5fxol"]
+[ext_resource type="Script" uid="uid://bl0n4atrdcogm" path="res://gui/menus/error.gd" id="2_dbe41"]
+[ext_resource type="PackedScene" uid="uid://bg2d78ycorcqk" path="res://gui/menus/transition/scene_transition.tscn" id="4_1nbt3"]
+[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://gui/resources/materials/dark_blur_material.tres" id="4_hxkkd"]
+[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://gui/components/smart_margin_container.gd" id="5_rfcg2"]
 
 [node name="ErrorMenu" type="Control"]
 layout_mode = 3
diff --git a/client/menu/game.gd b/client/gui/menus/game.gd
index 1516f4b8..a4916b92 100644
--- a/client/menu/game.gd
+++ b/client/gui/menus/game.gd
@@ -36,7 +36,7 @@ func _input(_event):
 	if Input.is_action_just_pressed("chat"):
 		Sound.play_click()
 		chat_preview.visible = false
-		await submenu("res://menu/communicate/chat/chat_open.tscn")
+		await submenu("res://gui/menus/chat.tscn")
 		chat_preview.visible = true
 	
 	if Input.is_action_just_pressed("toggle_overlay"):
@@ -55,7 +55,7 @@ func _process(_delta):
 func open_ingame_menu():
 	if popup != null: return
 	Sound.play_click()
-	submenu("res://menu/ingame.tscn")
+	submenu("res://gui/menus/ingame.tscn")
 
 func apply_hide_overlays(v: bool):
 	overlay.visible = v
diff --git a/client/menu/game.gd.uid b/client/gui/menus/game.gd.uid
index 992bc7f3..992bc7f3 100644
--- a/client/menu/game.gd.uid
+++ b/client/gui/menus/game.gd.uid
diff --git a/client/menu/game.tscn b/client/gui/menus/game.tscn
index 277dd3f4..56df81d6 100644
--- a/client/menu/game.tscn
+++ b/client/gui/menus/game.tscn
@@ -1,12 +1,12 @@
 [gd_scene load_steps=8 format=3 uid="uid://bbjwoxs71fnsk"]
 
-[ext_resource type="Script" uid="uid://bmno0s2du3ie6" path="res://menu/game.gd" id="1_cdpsh"]
+[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://menu/overlay.tscn" id="3_i0ytb"]
-[ext_resource type="PackedScene" uid="uid://bc50la65ntifb" path="res://menu/lobby.tscn" id="3_udxby"]
-[ext_resource type="PackedScene" uid="uid://b21nrnkygiyjt" path="res://menu/communicate/popup_message/popup_message.tscn" id="5_n1wy0"]
-[ext_resource type="PackedScene" uid="uid://xcxbmynn8mhi" path="res://menu/communicate/chat/chat_preview.tscn" id="6_dh5lr"]
-[ext_resource type="PackedScene" uid="uid://dcrr1rwdwbkq8" path="res://menu/communicate/popup_message/pinned_item_messages.tscn" id="7_lf2li"]
+[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"]
 
 [node name="GameMenu" type="Control"]
 layout_mode = 3
diff --git a/client/menu/ingame.gd b/client/gui/menus/ingame.gd
index d45a6836..4809b2ee 100644
--- a/client/menu/ingame.gd
+++ b/client/gui/menus/ingame.gd
@@ -52,13 +52,13 @@ func _on_resume_pressed():
 	exit()
 
 func _on_main_menu_pressed():
-	parent_menu.replace_menu("res://menu/main.tscn")
+	parent_menu.replace_menu("res://gui/menus/main/main.tscn")
 
 func _on_settings_pressed():
-	submenu("res://menu/settings.tscn")
+	submenu("res://gui/menus/settings/settings.tscn")
 
 func _on_reconnect_pressed():
-	parent_menu.replace_menu("res://menu/game.tscn", parent_menu.data)
+	parent_menu.replace_menu("res://gui/menus/game.tscn", parent_menu.data)
 
 func _on_quit_pressed():
 	quit()
diff --git a/client/menu/ingame.gd.uid b/client/gui/menus/ingame.gd.uid
index 496c313c..496c313c 100644
--- a/client/menu/ingame.gd.uid
+++ b/client/gui/menus/ingame.gd.uid
diff --git a/client/menu/ingame.tscn b/client/gui/menus/ingame.tscn
index 099c535a..0a77af14 100644
--- a/client/menu/ingame.tscn
+++ b/client/gui/menus/ingame.tscn
@@ -1,12 +1,12 @@
 [gd_scene load_steps=12 format=3 uid="uid://lxlgtjm8hw7v"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_2vmyh"]
-[ext_resource type="Script" uid="uid://dyi2xohgxeybb" path="res://menu/ingame.gd" id="2_0h3no"]
-[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_vvvlt"]
-[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://menu/auto_setup/blur_setup.gd" id="4_b6bm7"]
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="4_scupw"]
-[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="4_vr8y1"]
-[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://menu/smart_margin_container.gd" id="6_poj4k"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_2vmyh"]
+[ext_resource type="Script" uid="uid://dyi2xohgxeybb" path="res://gui/menus/ingame.gd" id="2_0h3no"]
+[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://gui/resources/materials/dark_blur_material.tres" id="3_vvvlt"]
+[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://gui/components/blur_setup.gd" id="4_b6bm7"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://gui/resources/fonts/font-sansita-swashed.woff2" id="4_scupw"]
+[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://gui/resources/style/panel_style_sidebar.tres" id="4_vr8y1"]
+[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://gui/components/smart_margin_container.gd" id="6_poj4k"]
 
 [sub_resource type="Animation" id="Animation_8sedy"]
 length = 0.001
diff --git a/client/menu/about.gd b/client/gui/menus/main/about.gd
index 8cbbc49b..b56d3941 100644
--- a/client/menu/about.gd
+++ b/client/gui/menus/main/about.gd
@@ -148,13 +148,13 @@ func version_text() -> String:
 	return text
 
 func _on_credits_pressed() -> void:
-	submenu("res://menu/credits.tscn", credits_text())
+	submenu("res://gui/menus/popup_large.tscn", credits_text())
 
 func _on_legal_pressed() -> void:
-	submenu("res://menu/credits.tscn", legal_text())
+	submenu("res://gui/menus/popup_large.tscn", legal_text())
 
 func _on_version_pressed() -> void:
-	submenu("res://menu/credits.tscn", version_text())
+	submenu("res://gui/menus/popup_large.tscn", version_text())
 
 func _on_back_pressed() -> void:
 	exit()
diff --git a/client/menu/about.gd.uid b/client/gui/menus/main/about.gd.uid
index 3929f2c3..3929f2c3 100644
--- a/client/menu/about.gd.uid
+++ b/client/gui/menus/main/about.gd.uid
diff --git a/client/menu/about.tscn b/client/gui/menus/main/about.tscn
index 152b2e0e..006b61fe 100644
--- a/client/menu/about.tscn
+++ b/client/gui/menus/main/about.tscn
@@ -1,10 +1,10 @@
 [gd_scene load_steps=7 format=3 uid="uid://bpaenm8c6nmo8"]
 
-[ext_resource type="Script" uid="uid://pcu87stpkgd8" path="res://menu/about.gd" id="1_0acu0"]
-[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/materials/blur_material.tres" id="1_ai5pk"]
-[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="2_pya1x"]
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="4_kx3j7"]
-[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://menu/smart_margin_container.gd" id="4_t51wf"]
+[ext_resource type="Script" uid="uid://pcu87stpkgd8" path="res://gui/menus/main/about.gd" id="1_0acu0"]
+[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://gui/resources/materials/blur_material.tres" id="1_ai5pk"]
+[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://gui/resources/style/panel_style_sidebar.tres" id="2_pya1x"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://gui/resources/fonts/font-sansita-swashed.woff2" id="4_kx3j7"]
+[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://gui/components/smart_margin_container.gd" id="4_t51wf"]
 
 [sub_resource type="FontVariation" id="FontVariation_o2r3e"]
 base_font = ExtResource("4_kx3j7")
diff --git a/client/menu/menu_background.gd b/client/gui/menus/main/background.gd
index 4abb84b4..4abb84b4 100644
--- a/client/menu/menu_background.gd
+++ b/client/gui/menus/main/background.gd
diff --git a/client/menu/menu_background.gd.uid b/client/gui/menus/main/background.gd.uid
index 7d61d488..7d61d488 100644
--- a/client/menu/menu_background.gd.uid
+++ b/client/gui/menus/main/background.gd.uid
diff --git a/client/menu/menu_background.tscn b/client/gui/menus/main/background.tscn
index 51acfa5a..2bd4ee04 100644
--- a/client/menu/menu_background.tscn
+++ b/client/gui/menus/main/background.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=12 format=3 uid="uid://l4vm07dtda4j"]
 
-[ext_resource type="Script" uid="uid://b2tq5rcjjcxdg" path="res://menu/menu_background.gd" id="1_ijsg0"]
-[ext_resource type="Script" uid="uid://cwg7wympevxs4" path="res://map/auto_setup/environment_setup.gd" id="2_rkilw"]
-[ext_resource type="Shader" uid="uid://b1k6ipo0sagli" path="res://menu/theme/shaders/menu_background.gdshader" id="3_5mp8y"]
-[ext_resource type="PackedScene" uid="uid://b4gone8fu53r7" path="res://map/map.tscn" id="3_p80a7"]
+[ext_resource type="Script" uid="uid://b2tq5rcjjcxdg" path="res://gui/menus/main/background.gd" id="1_pgu7b"]
+[ext_resource type="Script" uid="uid://cwg7wympevxs4" path="res://map/auto_setup/environment_setup.gd" id="2_7dwbj"]
+[ext_resource type="Shader" uid="uid://b1k6ipo0sagli" path="res://gui/menus/main/clouds.gdshader" id="3_lapmn"]
+[ext_resource type="PackedScene" uid="uid://b4gone8fu53r7" path="res://map/map.tscn" id="4_nslxb"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_uw50b"]
 sky_top_color = Color(0.55, 0.55, 0.55, 1)
@@ -38,13 +38,13 @@ noise = SubResource("FastNoiseLite_e3eby")
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_gd87g"]
 render_priority = 0
-shader = ExtResource("3_5mp8y")
+shader = ExtResource("3_lapmn")
 shader_parameter/noise = SubResource("NoiseTexture2D_s4fnp")
 shader_parameter/ccloud = Color(0.835938, 0.835938, 0.835938, 1)
 shader_parameter/csky = Color(0.329412, 0.333333, 0.8, 1)
 
 [node name="MenuBackground" type="Node3D"]
-script = ExtResource("1_ijsg0")
+script = ExtResource("1_pgu7b")
 
 [node name="Camera" type="Camera3D" parent="."]
 transform = Transform3D(0.614606, 0.499662, -0.610408, -0.00282255, 0.775198, 0.631712, 0.78883, -0.386531, 0.477852, -9.13611, 4.90356, 1.22532)
@@ -60,7 +60,7 @@ shadow_enabled = true
 
 [node name="Environment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_slkjl")
-script = ExtResource("2_rkilw")
+script = ExtResource("2_7dwbj")
 allow_sdfgi = false
 
 [node name="the-sky-tm" type="MeshInstance3D" parent="."]
@@ -68,4 +68,4 @@ transform = Transform3D(0.614606, 0.499662, -0.610408, -0.00282255, 0.775198, 0.
 mesh = SubResource("QuadMesh_fvp2p")
 surface_material_override/0 = SubResource("ShaderMaterial_gd87g")
 
-[node name="Map" parent="." instance=ExtResource("3_p80a7")]
+[node name="Map" parent="." instance=ExtResource("4_nslxb")]
diff --git a/client/menu/theme/shaders/menu_background.gdshader b/client/gui/menus/main/clouds.gdshader
index 8103f691..8103f691 100644
--- a/client/menu/theme/shaders/menu_background.gdshader
+++ b/client/gui/menus/main/clouds.gdshader
diff --git a/client/menu/theme/shaders/menu_background.gdshader.uid b/client/gui/menus/main/clouds.gdshader.uid
index 00c2d21a..00c2d21a 100644
--- a/client/menu/theme/shaders/menu_background.gdshader.uid
+++ b/client/gui/menus/main/clouds.gdshader.uid
diff --git a/client/menu/main.gd b/client/gui/menus/main/main.gd
index 51b2b25d..423f756e 100644
--- a/client/menu/main.gd
+++ b/client/gui/menus/main/main.gd
@@ -32,13 +32,13 @@ func _on_quit_pressed():
 	quit()
 
 func _on_about_pressed():
-	submenu("res://menu/about.tscn")
+	submenu("res://gui/menus/main/about.tscn")
 
 func _on_change_character_pressed():
-	replace_menu("res://menu/character.tscn", null, "res://menu/main.tscn")
+	replace_menu("res://gui/menus/character.tscn", null, "res://gui/menus/main.tscn")
 
 func _on_settings_pressed():
-	submenu("res://menu/settings.tscn")
+	submenu("res://gui/menus/settings/settings.tscn")
 
 func _on_play_pressed():
-	submenu("res://menu/play.tscn")
+	submenu("res://gui/menus/main/play.tscn")
diff --git a/client/menu/main.gd.uid b/client/gui/menus/main/main.gd.uid
index dc2cecd3..dc2cecd3 100644
--- a/client/menu/main.gd.uid
+++ b/client/gui/menus/main/main.gd.uid
diff --git a/client/menu/main.tscn b/client/gui/menus/main/main.tscn
index 10dfcc21..81595966 100644
--- a/client/menu/main.tscn
+++ b/client/gui/menus/main/main.tscn
@@ -1,13 +1,13 @@
 [gd_scene load_steps=10 format=3 uid="uid://dbj8508whxgwv"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_3qfu3"]
-[ext_resource type="Script" uid="uid://bpiynadrmdd37" path="res://menu/main.gd" id="2_xjnc3"]
-[ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://menu/menu_background.tscn" id="3_4evao"]
-[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/materials/blur_material.tres" id="4_nx4vf"]
-[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://menu/auto_setup/blur_setup.gd" id="5_0mn56"]
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="5_k7bqq"]
-[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="5_qlyeo"]
-[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://menu/smart_margin_container.gd" id="7_btdj1"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_3qfu3"]
+[ext_resource type="Script" uid="uid://bpiynadrmdd37" path="res://gui/menus/main/main.gd" id="2_xjnc3"]
+[ext_resource type="PackedScene" uid="uid://l4vm07dtda4j" path="res://gui/menus/main/background.tscn" id="3_4evao"]
+[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://gui/resources/materials/blur_material.tres" id="4_nx4vf"]
+[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://gui/components/blur_setup.gd" id="5_0mn56"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://gui/resources/fonts/font-sansita-swashed.woff2" id="5_k7bqq"]
+[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://gui/resources/style/panel_style_sidebar.tres" id="5_qlyeo"]
+[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://gui/components/smart_margin_container.gd" id="7_btdj1"]
 
 [sub_resource type="FontVariation" id="FontVariation_htgmg"]
 base_font = ExtResource("5_k7bqq")
diff --git a/client/menu/play.gd b/client/gui/menus/main/play.gd
index 25645522..c9cbee2f 100644
--- a/client/menu/play.gd
+++ b/client/gui/menus/main/play.gd
@@ -15,7 +15,7 @@
 #
 extends Menu
 
-var server_list_item: PackedScene = preload("res://menu/ui_elements/server_list_item.tscn")
+var server_list_item: PackedScene = preload("res://gui/menus/main/server_list_item.tscn")
 var url_regex: RegEx = RegEx.new()
 
 @onready var server_list: VBoxContainer = $side/margin/options/second/ScrollContainerCustom/ServerList
@@ -53,7 +53,7 @@ func _ready():
 		allow_button.pressed.connect(func(): Global.set_setting("online.use_registry", true))
 		deny_button.pressed.connect(func(): Global.set_setting("online.use_registry", false))
 		popup_data.buttons = [allow_button, deny_button]
-		await submenu("res://menu/popup.tscn", popup_data)
+		await submenu("res://gui/menus/popup.tscn", popup_data)
 		Global.set_profile("registry_asked", true)
 		Global.save_settings()
 		Global.save_profile()
@@ -126,7 +126,7 @@ func _on_quick_connect_pressed():
 
 func connect_to(url: String):
 	print("Connecting to %s" % url)
-	get_parent().replace_menu("res://menu/game.tscn", url)
+	get_parent().replace_menu("res://gui/menus/game.tscn", url)
 
 func _on_server_control_pressed():
 	match Server.state:
diff --git a/client/menu/play.gd.uid b/client/gui/menus/main/play.gd.uid
index d8ca168f..d8ca168f 100644
--- a/client/menu/play.gd.uid
+++ b/client/gui/menus/main/play.gd.uid
diff --git a/client/menu/play.tscn b/client/gui/menus/main/play.tscn
index 6a7d5fdd..441024a2 100644
--- a/client/menu/play.tscn
+++ b/client/gui/menus/main/play.tscn
@@ -1,11 +1,11 @@
 [gd_scene load_steps=9 format=3 uid="uid://c8url5fpttbem"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_cckds"]
-[ext_resource type="Script" uid="uid://b126k2228nj4s" path="res://menu/play.gd" id="2_phxx0"]
-[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/materials/blur_material.tres" id="3_fsbt7"]
-[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://menu/smart_margin_container.gd" id="4_gst6r"]
-[ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://menu/auto_setup/scroll_container_custom.gd" id="5_cm120"]
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="5_ojpbf"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_cckds"]
+[ext_resource type="Script" uid="uid://b126k2228nj4s" path="res://gui/menus/main/play.gd" id="2_phxx0"]
+[ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://gui/resources/materials/blur_material.tres" id="3_fsbt7"]
+[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://gui/components/smart_margin_container.gd" id="4_gst6r"]
+[ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://gui/components/touch_scroll_container.gd" id="5_cm120"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://gui/resources/fonts/font-sansita-swashed.woff2" id="5_ojpbf"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ukani"]
 
diff --git a/client/menu/ui_elements/server_list_item.gd b/client/gui/menus/main/server_list_item.gd
index 18b94b12..0cffdd72 100644
--- a/client/menu/ui_elements/server_list_item.gd
+++ b/client/gui/menus/main/server_list_item.gd
@@ -16,7 +16,7 @@
 class_name ServerListItem
 extends PanelContainer
 
-var error_style_focus: StyleBoxFlat = preload("res://menu/theme/style/error_focus_style.tres")
+var error_style_focus: StyleBoxFlat = preload("res://gui/resources/style/error_focus_style.tres")
 @onready var title: Label = $MarginContainer/VBoxContainer/Title
 @onready var info: Label = $MarginContainer/VBoxContainer/Info
 @onready var button: Button = $Button
diff --git a/client/menu/ui_elements/server_list_item.gd.uid b/client/gui/menus/main/server_list_item.gd.uid
index 276bb06f..276bb06f 100644
--- a/client/menu/ui_elements/server_list_item.gd.uid
+++ b/client/gui/menus/main/server_list_item.gd.uid
diff --git a/client/menu/ui_elements/server_list_item.tscn b/client/gui/menus/main/server_list_item.tscn
index 8b0eaf13..40e9eedb 100644
--- a/client/menu/ui_elements/server_list_item.tscn
+++ b/client/gui/menus/main/server_list_item.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://t2h60dhuvfsk"]
 
-[ext_resource type="Script" uid="uid://xr5oigbgd0aw" path="res://menu/ui_elements/server_list_item.gd" id="1_1n1yg"]
+[ext_resource type="Script" uid="uid://xr5oigbgd0aw" path="res://gui/menus/main/server_list_item.gd" id="1_1n1yg"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_1n1yg"]
 
diff --git a/client/menu/menu.gd b/client/gui/menus/menu.gd
index 7af27148..0f6e0624 100644
--- a/client/menu/menu.gd
+++ b/client/gui/menus/menu.gd
@@ -26,7 +26,7 @@ var data
 
 signal submenu_close()
 
-const transition_scene = preload("res://menu/scene_transition.tscn")
+const transition_scene = preload("res://gui/menus/transition/scene_transition.tscn")
 var transition: SceneTransition
 var parent_menu: Menu = null
 var previous_path = null # : String
diff --git a/client/menu/menu.gd.uid b/client/gui/menus/menu.gd.uid
index 5711a6e0..5711a6e0 100644
--- a/client/menu/menu.gd.uid
+++ b/client/gui/menus/menu.gd.uid
diff --git a/client/menu/popup.gd b/client/gui/menus/popup.gd
index d4849e92..d4849e92 100644
--- a/client/menu/popup.gd
+++ b/client/gui/menus/popup.gd
diff --git a/client/menu/popup.gd.uid b/client/gui/menus/popup.gd.uid
index 4800ca4d..4800ca4d 100644
--- a/client/menu/popup.gd.uid
+++ b/client/gui/menus/popup.gd.uid
diff --git a/client/menu/popup.tscn b/client/gui/menus/popup.tscn
index bb40bc45..13137ccb 100644
--- a/client/menu/popup.tscn
+++ b/client/gui/menus/popup.tscn
@@ -1,10 +1,10 @@
 [gd_scene load_steps=6 format=3 uid="uid://lwtym0pbc17g"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_m0d0r"]
-[ext_resource type="Script" uid="uid://bevyiytj5tawr" path="res://menu/popup.gd" id="2_1h10j"]
-[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_iouvy"]
-[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://menu/smart_margin_container.gd" id="3_j0ajn"]
-[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://menu/auto_setup/blur_setup.gd" id="4_e4iqk"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_m0d0r"]
+[ext_resource type="Script" uid="uid://bevyiytj5tawr" path="res://gui/menus/popup.gd" id="2_1h10j"]
+[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://gui/resources/materials/dark_blur_material.tres" id="3_iouvy"]
+[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://gui/components/smart_margin_container.gd" id="3_j0ajn"]
+[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://gui/components/blur_setup.gd" id="4_e4iqk"]
 
 [node name="Popup" type="Control"]
 layout_mode = 3
diff --git a/client/menu/credits.gd b/client/gui/menus/popup_large.gd
index 909ee4c0..909ee4c0 100644
--- a/client/menu/credits.gd
+++ b/client/gui/menus/popup_large.gd
diff --git a/client/menu/credits.gd.uid b/client/gui/menus/popup_large.gd.uid
index aef2a852..aef2a852 100644
--- a/client/menu/credits.gd.uid
+++ b/client/gui/menus/popup_large.gd.uid
diff --git a/client/menu/credits.tscn b/client/gui/menus/popup_large.tscn
index a9b56d67..993dde9d 100644
--- a/client/menu/credits.tscn
+++ b/client/gui/menus/popup_large.tscn
@@ -1,11 +1,11 @@
 [gd_scene load_steps=7 format=3 uid="uid://7mqbxa054bjv"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_16kk6"]
-[ext_resource type="Script" uid="uid://c3eimx76ucpsp" path="res://menu/credits.gd" id="2_alvab"]
-[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://menu/smart_margin_container.gd" id="3_i6qat"]
-[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_nwoiv"]
-[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://menu/auto_setup/blur_setup.gd" id="4_8sii3"]
-[ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://menu/auto_setup/scroll_container_custom.gd" id="4_bfcw8"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_kabr3"]
+[ext_resource type="Script" uid="uid://c3eimx76ucpsp" path="res://gui/menus/popup_large.gd" id="2_m0b5d"]
+[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://gui/components/smart_margin_container.gd" id="3_36vhf"]
+[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://gui/resources/materials/dark_blur_material.tres" id="4_8ybj3"]
+[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"]
 layout_mode = 3
@@ -14,8 +14,8 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme = ExtResource("1_16kk6")
-script = ExtResource("2_alvab")
+theme = ExtResource("1_kabr3")
+script = ExtResource("2_m0b5d")
 support_anim = false
 
 [node name="OuterMargin" type="MarginContainer" parent="."]
@@ -25,12 +25,12 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-script = ExtResource("3_i6qat")
+script = ExtResource("3_36vhf")
 
 [node name="Panel" type="Panel" parent="OuterMargin"]
-material = ExtResource("3_nwoiv")
+material = ExtResource("4_8ybj3")
 layout_mode = 2
-script = ExtResource("4_8sii3")
+script = ExtResource("5_63jf0")
 
 [node name="InnerMargin" type="MarginContainer" parent="OuterMargin/Panel"]
 layout_mode = 1
@@ -50,7 +50,7 @@ layout_mode = 2
 [node name="ScrollContainer" type="ScrollContainer" parent="OuterMargin/Panel/InnerMargin/Vert"]
 layout_mode = 2
 size_flags_vertical = 3
-script = ExtResource("4_bfcw8")
+script = ExtResource("6_smk7v")
 
 [node name="CreditsText" type="RichTextLabel" parent="OuterMargin/Panel/InnerMargin/Vert/ScrollContainer"]
 auto_translate_mode = 2
diff --git a/client/menu/rating/desaturate.gdshader b/client/gui/menus/rating/desaturate.gdshader
index e6861560..e6861560 100644
--- a/client/menu/rating/desaturate.gdshader
+++ b/client/gui/menus/rating/desaturate.gdshader
diff --git a/client/menu/rating/desaturate.gdshader.uid b/client/gui/menus/rating/desaturate.gdshader.uid
index 621837a6..621837a6 100644
--- a/client/menu/rating/desaturate.gdshader.uid
+++ b/client/gui/menus/rating/desaturate.gdshader.uid
diff --git a/client/menu/rating/rating.gd b/client/gui/menus/rating/rating.gd
index 023c1333..023c1333 100644
--- a/client/menu/rating/rating.gd
+++ b/client/gui/menus/rating/rating.gd
diff --git a/client/menu/rating/rating.gd.uid b/client/gui/menus/rating/rating.gd.uid
index fd729d8f..fd729d8f 100644
--- a/client/menu/rating/rating.gd.uid
+++ b/client/gui/menus/rating/rating.gd.uid
diff --git a/client/menu/rating/rating.tscn b/client/gui/menus/rating/rating.tscn
index 82ca7697..062dcca2 100644
--- a/client/menu/rating/rating.tscn
+++ b/client/gui/menus/rating/rating.tscn
@@ -1,11 +1,11 @@
 [gd_scene load_steps=12 format=3 uid="uid://buu3cdpigs8qq"]
 
 [ext_resource type="Texture2D" uid="uid://b10goh4dsa3b0" path="res://player/particles/satisfied/star.webp" id="1_7qv7r"]
-[ext_resource type="Shader" uid="uid://cekkkqsvd7rvw" path="res://menu/rating/desaturate.gdshader" id="1_pddsm"]
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_uwajf"]
-[ext_resource type="Script" uid="uid://5tmklxkaa6e0" path="res://menu/rating/rating.gd" id="2_cq0se"]
-[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="4_hdurb"]
-[ext_resource type="AudioStream" uid="uid://camy77x26mmpv" path="res://menu/sounds/success.ogg" id="5_tutpj"]
+[ext_resource type="Shader" uid="uid://cekkkqsvd7rvw" path="res://gui/menus/rating/desaturate.gdshader" id="1_pddsm"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_uwajf"]
+[ext_resource type="Script" uid="uid://5tmklxkaa6e0" path="res://gui/menus/rating/rating.gd" id="2_cq0se"]
+[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://gui/resources/materials/dark_blur_material.tres" id="4_hdurb"]
+[ext_resource type="AudioStream" uid="uid://camy77x26mmpv" path="res://gui/resources/sounds/success.ogg" id="5_tutpj"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_oi7xd"]
 shader = ExtResource("1_pddsm")
diff --git a/client/menu/settings/button_setting.gd b/client/gui/menus/settings/button_setting.gd
index fff8c184..fff8c184 100644
--- a/client/menu/settings/button_setting.gd
+++ b/client/gui/menus/settings/button_setting.gd
diff --git a/client/menu/settings/button_setting.gd.uid b/client/gui/menus/settings/button_setting.gd.uid
index cf0a8d95..cf0a8d95 100644
--- a/client/menu/settings/button_setting.gd.uid
+++ b/client/gui/menus/settings/button_setting.gd.uid
diff --git a/client/menu/settings/dropdown_setting.gd b/client/gui/menus/settings/dropdown_setting.gd
index 514df666..514df666 100644
--- a/client/menu/settings/dropdown_setting.gd
+++ b/client/gui/menus/settings/dropdown_setting.gd
diff --git a/client/menu/settings/dropdown_setting.gd.uid b/client/gui/menus/settings/dropdown_setting.gd.uid
index 409bf3ab..409bf3ab 100644
--- a/client/menu/settings/dropdown_setting.gd.uid
+++ b/client/gui/menus/settings/dropdown_setting.gd.uid
diff --git a/client/menu/settings/game_setting.gd b/client/gui/menus/settings/game_setting.gd
index 4c8e561a..1c04ad3b 100644
--- a/client/menu/settings/game_setting.gd
+++ b/client/gui/menus/settings/game_setting.gd
@@ -29,7 +29,7 @@ func set_parent(parent: GameSetting):
 	nskey = "c.settings." + key
 
 func create_row():
-	var row = preload("res://menu/settings/settings_row.tscn").instantiate()
+	var row = preload("res://gui/menus/settings/settings_row.tscn").instantiate()
 	row.description = tr(nskey)
 	row.reset.connect(func(): Global.set_setting(key, default))
 	return row
diff --git a/client/menu/settings/game_setting.gd.uid b/client/gui/menus/settings/game_setting.gd.uid
index 99d79bee..99d79bee 100644
--- a/client/menu/settings/game_setting.gd.uid
+++ b/client/gui/menus/settings/game_setting.gd.uid
diff --git a/client/menu/settings/input/input_manager.gd b/client/gui/menus/settings/input/input_manager.gd
index e3158a03..e3158a03 100644
--- a/client/menu/settings/input/input_manager.gd
+++ b/client/gui/menus/settings/input/input_manager.gd
diff --git a/client/menu/settings/input/input_manager.gd.uid b/client/gui/menus/settings/input/input_manager.gd.uid
index 678c2192..678c2192 100644
--- a/client/menu/settings/input/input_manager.gd.uid
+++ b/client/gui/menus/settings/input/input_manager.gd.uid
diff --git a/client/menu/settings/input/input_setting.gd b/client/gui/menus/settings/input/input_setting.gd
index 72e1aa81..fa903771 100644
--- a/client/menu/settings/input/input_setting.gd
+++ b/client/gui/menus/settings/input/input_setting.gd
@@ -16,7 +16,7 @@
 class_name InputSetting
 extends GameSetting
 
-const INPUT_VALUE_NODE_SCENE = preload("res://menu/settings/input/input_value_node.tscn")
+const INPUT_VALUE_NODE_SCENE = preload("res://gui/menus/settings/input/input_value_node.tscn")
 
 func _init(new_id: String):
 	super(new_id)
diff --git a/client/menu/settings/input/input_setting.gd.uid b/client/gui/menus/settings/input/input_setting.gd.uid
index 7866fc2f..7866fc2f 100644
--- a/client/menu/settings/input/input_setting.gd.uid
+++ b/client/gui/menus/settings/input/input_setting.gd.uid
diff --git a/client/menu/settings/input/input_value_node.gd b/client/gui/menus/settings/input/input_value_node.gd
index 7c718e25..7c718e25 100644
--- a/client/menu/settings/input/input_value_node.gd
+++ b/client/gui/menus/settings/input/input_value_node.gd
diff --git a/client/menu/settings/input/input_value_node.gd.uid b/client/gui/menus/settings/input/input_value_node.gd.uid
index 3669b991..3669b991 100644
--- a/client/menu/settings/input/input_value_node.gd.uid
+++ b/client/gui/menus/settings/input/input_value_node.gd.uid
diff --git a/client/menu/settings/input/input_value_node.tscn b/client/gui/menus/settings/input/input_value_node.tscn
index c5ddc56f..1b2e89c4 100644
--- a/client/menu/settings/input/input_value_node.tscn
+++ b/client/gui/menus/settings/input/input_value_node.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://c6r0nv5daq7wc"]
 
-[ext_resource type="Script" uid="uid://ckb78voiq05e3" path="res://menu/settings/input/input_value_node.gd" id="1_snxax"]
-[ext_resource type="Texture2D" uid="uid://cnfjbowd2i02r" path="res://menu/icons/plus.svg" id="2_3vlvc"]
+[ext_resource type="Script" uid="uid://ckb78voiq05e3" path="res://gui/menus/settings/input/input_value_node.gd" id="1_snxax"]
+[ext_resource type="Texture2D" uid="uid://cnfjbowd2i02r" path="res://gui/resources/icons/plus.svg" id="2_3vlvc"]
 
 [node name="InputValueNode" type="VBoxContainer"]
 offset_right = 128.0
diff --git a/client/menu/settings/number_setting.gd b/client/gui/menus/settings/number_setting.gd
index 5fa5a115..5fa5a115 100644
--- a/client/menu/settings/number_setting.gd
+++ b/client/gui/menus/settings/number_setting.gd
diff --git a/client/menu/settings/number_setting.gd.uid b/client/gui/menus/settings/number_setting.gd.uid
index 4301c642..4301c642 100644
--- a/client/menu/settings/number_setting.gd.uid
+++ b/client/gui/menus/settings/number_setting.gd.uid
diff --git a/client/menu/settings/path_setting.gd b/client/gui/menus/settings/path_setting.gd
index b09ccccd..37492ed7 100644
--- a/client/menu/settings/path_setting.gd
+++ b/client/gui/menus/settings/path_setting.gd
@@ -16,8 +16,8 @@
 class_name PathSetting
 extends TextSetting
 
-var select_file_icon: Texture2D = preload("res://menu/icons/select_file.svg")
-var select_dir_icon: Texture2D = preload("res://menu/icons/select_directory.svg")
+var select_file_icon: Texture2D = preload("res://gui/resources/icons/select_file.svg")
+var select_dir_icon: Texture2D = preload("res://gui/resources/icons/select_directory.svg")
 
 var access: FileDialog.Access
 var file_mode: FileDialog.FileMode
diff --git a/client/menu/settings/path_setting.gd.uid b/client/gui/menus/settings/path_setting.gd.uid
index a524b17c..a524b17c 100644
--- a/client/menu/settings/path_setting.gd.uid
+++ b/client/gui/menus/settings/path_setting.gd.uid
diff --git a/client/menu/settings/preset_row.gd b/client/gui/menus/settings/preset_row.gd
index f3c46a26..f3c46a26 100644
--- a/client/menu/settings/preset_row.gd
+++ b/client/gui/menus/settings/preset_row.gd
diff --git a/client/menu/settings/preset_row.gd.uid b/client/gui/menus/settings/preset_row.gd.uid
index 51605058..51605058 100644
--- a/client/menu/settings/preset_row.gd.uid
+++ b/client/gui/menus/settings/preset_row.gd.uid
diff --git a/client/menu/settings/range_setting.gd b/client/gui/menus/settings/range_setting.gd
index b8d392a4..b8d392a4 100644
--- a/client/menu/settings/range_setting.gd
+++ b/client/gui/menus/settings/range_setting.gd
diff --git a/client/menu/settings/range_setting.gd.uid b/client/gui/menus/settings/range_setting.gd.uid
index a4ca49a2..a4ca49a2 100644
--- a/client/menu/settings/range_setting.gd.uid
+++ b/client/gui/menus/settings/range_setting.gd.uid
diff --git a/client/menu/settings.gd b/client/gui/menus/settings/settings.gd
index 32da54cc..32da54cc 100644
--- a/client/menu/settings.gd
+++ b/client/gui/menus/settings/settings.gd
diff --git a/client/menu/settings.gd.uid b/client/gui/menus/settings/settings.gd.uid
index 79b89b85..79b89b85 100644
--- a/client/menu/settings.gd.uid
+++ b/client/gui/menus/settings/settings.gd.uid
diff --git a/client/menu/settings.tscn b/client/gui/menus/settings/settings.tscn
index 66571533..71549464 100644
--- a/client/menu/settings.tscn
+++ b/client/gui/menus/settings/settings.tscn
@@ -1,10 +1,10 @@
 [gd_scene load_steps=6 format=3 uid="uid://8ic77jmadadj"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_foq3a"]
-[ext_resource type="Script" uid="uid://bbqmsf8u5rhtn" path="res://menu/settings.gd" id="2_3hgm8"]
-[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_8nykw"]
-[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://menu/smart_margin_container.gd" id="3_lwjig"]
-[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://menu/auto_setup/blur_setup.gd" id="4_v6q3y"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_1vjiw"]
+[ext_resource type="Script" uid="uid://bbqmsf8u5rhtn" path="res://gui/menus/settings/settings.gd" id="2_5xn7x"]
+[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://gui/components/smart_margin_container.gd" id="3_h533i"]
+[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://gui/resources/materials/dark_blur_material.tres" id="4_b0x33"]
+[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://gui/components/blur_setup.gd" id="5_dvivs"]
 
 [node name="SettingsMenu" type="Control"]
 layout_mode = 3
@@ -13,8 +13,8 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme = ExtResource("1_foq3a")
-script = ExtResource("2_3hgm8")
+theme = ExtResource("1_1vjiw")
+script = ExtResource("2_5xn7x")
 support_anim = false
 
 [node name="OuterGap" type="MarginContainer" parent="."]
@@ -25,12 +25,12 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 theme_override_constants/margin_left = 80
-script = ExtResource("3_lwjig")
+script = ExtResource("3_h533i")
 
 [node name="Panel" type="Panel" parent="OuterGap"]
-material = ExtResource("3_8nykw")
+material = ExtResource("4_b0x33")
 layout_mode = 2
-script = ExtResource("4_v6q3y")
+script = ExtResource("5_dvivs")
 
 [node name="InnerGap" type="MarginContainer" parent="OuterGap/Panel"]
 layout_mode = 1
diff --git a/client/menu/settings/settings_category.gd b/client/gui/menus/settings/settings_category.gd
index bf85abd9..bf85abd9 100644
--- a/client/menu/settings/settings_category.gd
+++ b/client/gui/menus/settings/settings_category.gd
diff --git a/client/menu/settings/settings_category.gd.uid b/client/gui/menus/settings/settings_category.gd.uid
index 421ce213..421ce213 100644
--- a/client/menu/settings/settings_category.gd.uid
+++ b/client/gui/menus/settings/settings_category.gd.uid
diff --git a/client/menu/settings/settings_root.gd b/client/gui/menus/settings/settings_root.gd
index a9a024d8..a9a024d8 100644
--- a/client/menu/settings/settings_root.gd
+++ b/client/gui/menus/settings/settings_root.gd
diff --git a/client/menu/settings/settings_root.gd.uid b/client/gui/menus/settings/settings_root.gd.uid
index 95a46d5e..95a46d5e 100644
--- a/client/menu/settings/settings_root.gd.uid
+++ b/client/gui/menus/settings/settings_root.gd.uid
diff --git a/client/menu/settings/settings_row.gd b/client/gui/menus/settings/settings_row.gd
index d88d49c1..d88d49c1 100644
--- a/client/menu/settings/settings_row.gd
+++ b/client/gui/menus/settings/settings_row.gd
diff --git a/client/menu/settings/settings_row.gd.uid b/client/gui/menus/settings/settings_row.gd.uid
index a6dea492..a6dea492 100644
--- a/client/menu/settings/settings_row.gd.uid
+++ b/client/gui/menus/settings/settings_row.gd.uid
diff --git a/client/menu/settings/settings_row.tscn b/client/gui/menus/settings/settings_row.tscn
index 1d194426..09378ab6 100644
--- a/client/menu/settings/settings_row.tscn
+++ b/client/gui/menus/settings/settings_row.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=7 format=3 uid="uid://o5e5vpem8w0k"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_iij3k"]
-[ext_resource type="Script" uid="uid://b3m1f76o5qo68" path="res://menu/settings/settings_row.gd" id="2_l8i7p"]
-[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="3_7k5da"]
-[ext_resource type="Texture2D" uid="uid://cucnmy0j5n8l8" path="res://menu/icons/reset.svg" id="4_bj3dr"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_iij3k"]
+[ext_resource type="Script" uid="uid://b3m1f76o5qo68" path="res://gui/menus/settings/settings_row.gd" id="2_l8i7p"]
+[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://gui/resources/fonts/font-josefin-sans.woff2" id="3_7k5da"]
+[ext_resource type="Texture2D" uid="uid://cucnmy0j5n8l8" path="res://gui/resources/icons/reset.svg" id="4_bj3dr"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_pk3rs"]
 content_margin_left = 16.0
diff --git a/client/menu/settings/text_setting.gd b/client/gui/menus/settings/text_setting.gd
index 8e2b6bec..8e2b6bec 100644
--- a/client/menu/settings/text_setting.gd
+++ b/client/gui/menus/settings/text_setting.gd
diff --git a/client/menu/settings/text_setting.gd.uid b/client/gui/menus/settings/text_setting.gd.uid
index 58ac5abe..58ac5abe 100644
--- a/client/menu/settings/text_setting.gd.uid
+++ b/client/gui/menus/settings/text_setting.gd.uid
diff --git a/client/menu/settings/toggle_setting.gd b/client/gui/menus/settings/toggle_setting.gd
index abcb7f4a..abcb7f4a 100644
--- a/client/menu/settings/toggle_setting.gd
+++ b/client/gui/menus/settings/toggle_setting.gd
diff --git a/client/menu/settings/toggle_setting.gd.uid b/client/gui/menus/settings/toggle_setting.gd.uid
index 1d2ca55b..1d2ca55b 100644
--- a/client/menu/settings/toggle_setting.gd.uid
+++ b/client/gui/menus/settings/toggle_setting.gd.uid
diff --git a/client/menu/hairstyle_preview.gd b/client/gui/menus/setup/hairstyle_preview.gd
index 78576491..78576491 100644
--- a/client/menu/hairstyle_preview.gd
+++ b/client/gui/menus/setup/hairstyle_preview.gd
diff --git a/client/menu/hairstyle_preview.gd.uid b/client/gui/menus/setup/hairstyle_preview.gd.uid
index 8f5b3cd4..8f5b3cd4 100644
--- a/client/menu/hairstyle_preview.gd.uid
+++ b/client/gui/menus/setup/hairstyle_preview.gd.uid
diff --git a/client/menu/hairstyle_preview.tscn b/client/gui/menus/setup/hairstyle_preview.tscn
index 51e6fcaf..ee4a65e9 100644
--- a/client/menu/hairstyle_preview.tscn
+++ b/client/gui/menus/setup/hairstyle_preview.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=7 format=3 uid="uid://dfon56nwd2tgn"]
 
-[ext_resource type="Script" uid="uid://dvveoqur81l0s" path="res://menu/hairstyle_preview.gd" id="1_0qdmv"]
-[ext_resource type="Shader" uid="uid://qjrh2imc53u1" path="res://menu/theme/shaders/grayscale.gdshader" id="1_sf0gc"]
+[ext_resource type="Script" uid="uid://dvveoqur81l0s" path="res://gui/menus/setup/hairstyle_preview.gd" id="1_0qdmv"]
+[ext_resource type="Shader" uid="uid://qjrh2imc53u1" path="res://gui/resources/shaders/grayscale.gdshader" id="1_sf0gc"]
 [ext_resource type="PackedScene" uid="uid://b3hhir2fvnunu" path="res://player/character/character.tscn" id="2_jtitc"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_entrs"]
diff --git a/client/menu/setup.gd b/client/gui/menus/setup/setup.gd
index e2bcce55..6170786c 100644
--- a/client/menu/setup.gd
+++ b/client/gui/menus/setup/setup.gd
@@ -31,7 +31,7 @@ func _ready():
 	anim.play("paper_slide")
 	var button_group := ButtonGroup.new()
 	for i in range(3):
-		var preview: HairstylePreview = preload("res://menu/hairstyle_preview.tscn").instantiate()
+		var preview: HairstylePreview = preload("res://gui/menus/setup/hairstyle_preview.tscn").instantiate()
 		select_uniform.add_child(preview)
 		preview.setup(i, button_group)
 		preview.selected.connect(_character_selected)
@@ -82,7 +82,7 @@ func _on_sign_pressed():
 		var accept_button := Button.new()
 		accept_button.text = tr("c.menu.accept")
 		popup_data.buttons = [accept_button]
-		await submenu("res://menu/popup.tscn", popup_data)
+		await submenu("res://gui/menus/popup.tscn", popup_data)
 		return
 
 	sign_button.disabled = true
@@ -107,4 +107,4 @@ func _on_sign_pressed():
 	Global.get_viewport().msaa_2d = Viewport.MSAA_DISABLED
 
 	if not is_instance_of(parent_menu, Entry): exit()
-	else: replace_menu("res://menu/main.tscn")
+	else: replace_menu("res://gui/menu/main/main.tscn")
diff --git a/client/menu/setup.gd.uid b/client/gui/menus/setup/setup.gd.uid
index c9c2be3c..c9c2be3c 100644
--- a/client/menu/setup.gd.uid
+++ b/client/gui/menus/setup/setup.gd.uid
diff --git a/client/menu/setup.tscn b/client/gui/menus/setup/setup.tscn
index 52d3047f..d0cce350 100644
--- a/client/menu/setup.tscn
+++ b/client/gui/menus/setup/setup.tscn
@@ -1,11 +1,11 @@
 [gd_scene load_steps=15 format=3 uid="uid://ddl3efikvqp66"]
 
-[ext_resource type="Script" uid="uid://dxn6ow6hiwhbf" path="res://menu/setup.gd" id="1_mo46n"]
-[ext_resource type="Theme" uid="uid://ci2qajdoa1an1" path="res://menu/theme/theme/paper.tres" id="1_yq0aa"]
-[ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://menu/auto_setup/scroll_container_custom.gd" id="2_4caf2"]
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="3_2vg4d"]
-[ext_resource type="AudioStream" uid="uid://do7ii5hx71p0m" path="res://menu/sounds/page.ogg" id="5_xac6d"]
-[ext_resource type="AudioStream" uid="uid://5b3noxjmasmu" path="res://menu/sounds/sign.ogg" id="6_wf0gh"]
+[ext_resource type="Script" uid="uid://dxn6ow6hiwhbf" path="res://gui/menus/setup/setup.gd" id="1_mo46n"]
+[ext_resource type="Theme" uid="uid://ci2qajdoa1an1" path="res://gui/resources/theme/paper.tres" id="1_yq0aa"]
+[ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://gui/components/touch_scroll_container.gd" id="2_4caf2"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://gui/resources/fonts/font-sansita-swashed.woff2" id="3_2vg4d"]
+[ext_resource type="AudioStream" uid="uid://do7ii5hx71p0m" path="res://gui/resources/sounds/page.ogg" id="5_xac6d"]
+[ext_resource type="AudioStream" uid="uid://5b3noxjmasmu" path="res://gui/resources/sounds/sign.ogg" id="6_wf0gh"]
 
 [sub_resource type="Animation" id="Animation_m4a1a"]
 length = 0.001
@@ -70,6 +70,8 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_mo46n")
+support_anim = null
+auto_anim = null
 
 [node name="ColorRect" type="ColorRect" parent="."]
 layout_mode = 2
diff --git a/client/menu/scene_transition.gd b/client/gui/menus/transition/scene_transition.gd
index 330d67d6..330d67d6 100644
--- a/client/menu/scene_transition.gd
+++ b/client/gui/menus/transition/scene_transition.gd
diff --git a/client/menu/scene_transition.gd.uid b/client/gui/menus/transition/scene_transition.gd.uid
index 60f764ae..60f764ae 100644
--- a/client/menu/scene_transition.gd.uid
+++ b/client/gui/menus/transition/scene_transition.gd.uid
diff --git a/client/menu/scene_transition.tscn b/client/gui/menus/transition/scene_transition.tscn
index 370b6368..dab16084 100644
--- a/client/menu/scene_transition.tscn
+++ b/client/gui/menus/transition/scene_transition.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=11 format=3 uid="uid://bg2d78ycorcqk"]
 
-[ext_resource type="Script" uid="uid://ciml1u2x4f1ci" path="res://menu/scene_transition.gd" id="1_fpbwj"]
-[ext_resource type="Shader" uid="uid://bmxrbbw18xq7u" path="res://menu/text_loading_anim.gdshader" id="2_g21ck"]
+[ext_resource type="Script" uid="uid://ciml1u2x4f1ci" path="res://gui/menus/transition/scene_transition.gd" id="1_fpbwj"]
+[ext_resource type="Shader" uid="uid://bmxrbbw18xq7u" path="res://gui/menus/transition/text_loading_anim.gdshader" id="2_g21ck"]
 
 [sub_resource type="Animation" id="Animation_g21ck"]
 length = 0.001
diff --git a/client/menu/text_loading_anim.gdshader b/client/gui/menus/transition/text_loading_anim.gdshader
index 145dab78..145dab78 100644
--- a/client/menu/text_loading_anim.gdshader
+++ b/client/gui/menus/transition/text_loading_anim.gdshader
diff --git a/client/menu/text_loading_anim.gdshader.uid b/client/gui/menus/transition/text_loading_anim.gdshader.uid
index 26730c73..26730c73 100644
--- a/client/menu/text_loading_anim.gdshader.uid
+++ b/client/gui/menus/transition/text_loading_anim.gdshader.uid
diff --git a/client/menu/announce_title.gd b/client/gui/overlays/ingame/announce_title.gd
index 227e184f..227e184f 100644
--- a/client/menu/announce_title.gd
+++ b/client/gui/overlays/ingame/announce_title.gd
diff --git a/client/menu/announce_title.gd.uid b/client/gui/overlays/ingame/announce_title.gd.uid
index e57b9722..e57b9722 100644
--- a/client/menu/announce_title.gd.uid
+++ b/client/gui/overlays/ingame/announce_title.gd.uid
diff --git a/client/menu/communicate/chat/chat_preview.gd b/client/gui/overlays/ingame/chat.gd
index e41c0b15..673dc979 100644
--- a/client/menu/communicate/chat/chat_preview.gd
+++ b/client/gui/overlays/ingame/chat.gd
@@ -16,7 +16,7 @@
 extends Control
 class_name ChatPreview
 
-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 game: Game = $"../Game"
 @onready var messages_container: VBoxContainer = $MarginContainer/ScrollContainer/PanelContainer/Messages
diff --git a/client/menu/communicate/chat/chat_preview.gd.uid b/client/gui/overlays/ingame/chat.gd.uid
index 7a372630..7a372630 100644
--- a/client/menu/communicate/chat/chat_preview.gd.uid
+++ b/client/gui/overlays/ingame/chat.gd.uid
diff --git a/client/menu/communicate/chat/chat_preview.tscn b/client/gui/overlays/ingame/chat.tscn
index bd3c8ffa..f5b1060c 100644
--- a/client/menu/communicate/chat/chat_preview.tscn
+++ b/client/gui/overlays/ingame/chat.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=5 format=3 uid="uid://xcxbmynn8mhi"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_x8ock"]
-[ext_resource type="Script" uid="uid://bgt04y4ncl1fv" path="res://menu/communicate/chat/chat_preview.gd" id="2_72x70"]
-[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="4_jo1xn"]
-[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://menu/auto_setup/blur_setup.gd" id="5_1l77s"]
+[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="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"]
 
 [node name="ChatPreview" type="Control"]
 layout_mode = 3
@@ -13,8 +13,8 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
-theme = ExtResource("1_x8ock")
-script = ExtResource("2_72x70")
+theme = ExtResource("1_lmy51")
+script = ExtResource("2_3543w")
 
 [node name="MarginContainer" type="MarginContainer" parent="."]
 layout_mode = 2
@@ -27,12 +27,12 @@ layout_mode = 2
 horizontal_scroll_mode = 0
 
 [node name="PanelContainer" type="PanelContainer" parent="MarginContainer/ScrollContainer"]
-material = ExtResource("4_jo1xn")
+material = ExtResource("3_15i2y")
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 0
 mouse_filter = 2
-script = ExtResource("5_1l77s")
+script = ExtResource("4_3rmhr")
 
 [node name="Messages" type="VBoxContainer" parent="MarginContainer/ScrollContainer/PanelContainer"]
 layout_mode = 2
diff --git a/client/menu/overlay.gd b/client/gui/overlays/ingame/score.gd
index d4e2e3d3..d4e2e3d3 100644
--- a/client/menu/overlay.gd
+++ b/client/gui/overlays/ingame/score.gd
diff --git a/client/menu/overlay.gd.uid b/client/gui/overlays/ingame/score.gd.uid
index ff13fb53..ff13fb53 100644
--- a/client/menu/overlay.gd.uid
+++ b/client/gui/overlays/ingame/score.gd.uid
diff --git a/client/menu/overlay.tscn b/client/gui/overlays/ingame/score.tscn
index 79f0b78e..497275f5 100644
--- a/client/menu/overlay.tscn
+++ b/client/gui/overlays/ingame/score.tscn
@@ -1,10 +1,10 @@
 [gd_scene load_steps=14 format=3 uid="uid://bpikve6wlsjfl"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_4kujw"]
-[ext_resource type="Script" uid="uid://mcgg3q0l03dx" path="res://menu/overlay.gd" id="2_kbjds"]
-[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://menu/textures/paper_texture.tres" id="3_oum5g"]
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="3_u54fv"]
-[ext_resource type="Script" uid="uid://ci08whhm2ej1m" path="res://menu/announce_title.gd" id="5_874f2"]
+[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)
diff --git a/client/menu/lobby.gd b/client/gui/overlays/lobby/lobby.gd
index 942f38c3..3971dbb3 100644
--- a/client/menu/lobby.gd
+++ b/client/gui/overlays/lobby/lobby.gd
@@ -17,7 +17,7 @@ extends Control
 class_name Lobby
 
 const MAX_BOT_COUNT_PER_TYPE: int = 3
-const PLAYER = preload("res://menu/lobby/player.tscn")
+const PLAYER = preload("res://gui/overlays/lobby/player.tscn")
 
 var map_count
 var selected_map := 0
diff --git a/client/menu/lobby.gd.uid b/client/gui/overlays/lobby/lobby.gd.uid
index b92e8681..b92e8681 100644
--- a/client/menu/lobby.gd.uid
+++ b/client/gui/overlays/lobby/lobby.gd.uid
diff --git a/client/menu/lobby.tscn b/client/gui/overlays/lobby/lobby.tscn
index 1921aabb..58ae2add 100644
--- a/client/menu/lobby.tscn
+++ b/client/gui/overlays/lobby/lobby.tscn
@@ -1,20 +1,20 @@
 [gd_scene load_steps=17 format=3 uid="uid://bc50la65ntifb"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_u18ke"]
-[ext_resource type="Script" uid="uid://bssjvsu44l0fn" path="res://menu/lobby.gd" id="2_7657i"]
-[ext_resource type="StyleBox" uid="uid://de80aw86emnql" path="res://menu/theme/style/lobby_panel_override.tres" id="3_6iqoe"]
-[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/materials/dark_blur_material.tres" id="3_esmbx"]
-[ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://menu/icons/arrow.svg" id="3_jxleg"]
-[ext_resource type="Texture2D" uid="uid://j75dbytlbju" path="res://menu/icons/arrow_pressed.svg" id="4_eapmn"]
-[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://menu/auto_setup/blur_setup.gd" id="5_am8pt"]
-[ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://menu/icons/arrow_hover.svg" id="5_odwav"]
-[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://menu/smart_margin_container.gd" id="6_7mu2u"]
-[ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://menu/icons/arrow_focus.svg" id="6_tulu3"]
-[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="8_cwbpa"]
-[ext_resource type="Texture2D" uid="uid://bsx6fo7mv2u6a" path="res://menu/controller_buttons/x.svg" id="9_q14bw"]
-[ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://menu/auto_setup/scroll_container_custom.gd" id="10_bgene"]
-[ext_resource type="Texture2D" uid="uid://cr2a6ide6vnnv" path="res://menu/controller_buttons/y.svg" id="11_5uugf"]
-[ext_resource type="Script" uid="uid://b1eomxildrq30" path="res://menu/controller_buttons/controller_button.gd" id="12_7mu2u"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_u18ke"]
+[ext_resource type="Script" uid="uid://bssjvsu44l0fn" path="res://gui/overlays/lobby/lobby.gd" id="2_7657i"]
+[ext_resource type="StyleBox" uid="uid://de80aw86emnql" path="res://gui/resources/style/lobby_panel_override.tres" id="3_6iqoe"]
+[ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://gui/resources/materials/dark_blur_material.tres" id="3_esmbx"]
+[ext_resource type="Texture2D" uid="uid://35rd5gamtyqm" path="res://gui/resources/icons/arrow.svg" id="3_jxleg"]
+[ext_resource type="Texture2D" uid="uid://j75dbytlbju" path="res://gui/resources/icons/arrow_pressed.svg" id="4_eapmn"]
+[ext_resource type="Script" uid="uid://cmncjc06kadpe" path="res://gui/components/blur_setup.gd" id="5_am8pt"]
+[ext_resource type="Texture2D" uid="uid://b33qmctbpf48g" path="res://gui/resources/icons/arrow_hover.svg" id="5_odwav"]
+[ext_resource type="Script" uid="uid://byshs20og68tn" path="res://gui/components/smart_margin_container.gd" id="6_7mu2u"]
+[ext_resource type="Texture2D" uid="uid://by3qsrpxnfq4w" path="res://gui/resources/icons/arrow_focus.svg" id="6_tulu3"]
+[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://gui/resources/fonts/font-josefin-sans.woff2" id="8_cwbpa"]
+[ext_resource type="Texture2D" uid="uid://bsx6fo7mv2u6a" path="res://gui/resources/icons/controller_x.svg" id="9_q14bw"]
+[ext_resource type="Script" uid="uid://bd7bylb2t2m0" path="res://gui/components/touch_scroll_container.gd" id="10_bgene"]
+[ext_resource type="Texture2D" uid="uid://cr2a6ide6vnnv" path="res://gui/resources/icons/controller_y.svg" id="11_5uugf"]
+[ext_resource type="Script" uid="uid://b1eomxildrq30" path="res://gui/components/controller_button.gd" id="12_7mu2u"]
 
 [sub_resource type="FontVariation" id="FontVariation_5xxr2"]
 base_font = ExtResource("8_cwbpa")
diff --git a/client/menu/lobby/player.gd b/client/gui/overlays/lobby/player.gd
index 175d6341..175d6341 100644
--- a/client/menu/lobby/player.gd
+++ b/client/gui/overlays/lobby/player.gd
diff --git a/client/menu/lobby/player.gd.uid b/client/gui/overlays/lobby/player.gd.uid
index b0971cdb..b0971cdb 100644
--- a/client/menu/lobby/player.gd.uid
+++ b/client/gui/overlays/lobby/player.gd.uid
diff --git a/client/menu/lobby/player.tscn b/client/gui/overlays/lobby/player.tscn
index a1a9260a..aa8997a1 100644
--- a/client/menu/lobby/player.tscn
+++ b/client/gui/overlays/lobby/player.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=6 format=3 uid="uid://gmldnel4xbxy"]
 
-[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme/theme.tres" id="1_flfqn"]
-[ext_resource type="Texture2D" uid="uid://222w1wha75od" path="res://menu/icons/user.webp" id="2_mnaqt"]
-[ext_resource type="Script" uid="uid://buxb488rr2ncs" path="res://menu/lobby/player.gd" id="2_w3lyk"]
+[ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://gui/resources/theme/theme.tres" id="1_flfqn"]
+[ext_resource type="Texture2D" uid="uid://222w1wha75od" path="res://gui/resources/icons/user.webp" id="2_mnaqt"]
+[ext_resource type="Script" uid="uid://buxb488rr2ncs" path="res://gui/overlays/lobby/player.gd" id="2_w3lyk"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_1227j"]
 bg_color = Color(0, 0, 0, 1)
diff --git a/client/menu/theme/fonts/font-azaret-mono.woff2 b/client/gui/resources/fonts/font-azaret-mono.woff2
index c413b182..c413b182 100644
--- a/client/menu/theme/fonts/font-azaret-mono.woff2
+++ b/client/gui/resources/fonts/font-azaret-mono.woff2
diff --git a/client/menu/theme/fonts/font-azaret-mono.woff2.import b/client/gui/resources/fonts/font-azaret-mono.woff2.import
index b6ad2a4c..364d3ba3 100644
--- a/client/menu/theme/fonts/font-azaret-mono.woff2.import
+++ b/client/gui/resources/fonts/font-azaret-mono.woff2.import
@@ -3,12 +3,12 @@
 importer="font_data_dynamic"
 type="FontFile"
 uid="uid://bk704sc5gkrb3"
-path="res://.godot/imported/font-azaret-mono.woff2-e51d1e7d25611225022685bd0a3a496f.fontdata"
+path="res://.godot/imported/font-azaret-mono.woff2-d201b5a023a336fb85edf509d0dd9fe6.fontdata"
 
 [deps]
 
-source_file="res://menu/theme/fonts/font-azaret-mono.woff2"
-dest_files=["res://.godot/imported/font-azaret-mono.woff2-e51d1e7d25611225022685bd0a3a496f.fontdata"]
+source_file="res://gui/resources/fonts/font-azaret-mono.woff2"
+dest_files=["res://.godot/imported/font-azaret-mono.woff2-d201b5a023a336fb85edf509d0dd9fe6.fontdata"]
 
 [params]
 
diff --git a/client/menu/theme/fonts/font-josefin-sans.woff2 b/client/gui/resources/fonts/font-josefin-sans.woff2
index dce2708f..dce2708f 100644
--- a/client/menu/theme/fonts/font-josefin-sans.woff2
+++ b/client/gui/resources/fonts/font-josefin-sans.woff2
diff --git a/client/menu/theme/fonts/font-josefin-sans.woff2.import b/client/gui/resources/fonts/font-josefin-sans.woff2.import
index 89bb6d85..849d69a4 100644
--- a/client/menu/theme/fonts/font-josefin-sans.woff2.import
+++ b/client/gui/resources/fonts/font-josefin-sans.woff2.import
@@ -3,12 +3,12 @@
 importer="font_data_dynamic"
 type="FontFile"
 uid="uid://5ixo6b3bd3km"
-path="res://.godot/imported/font-josefin-sans.woff2-3826b0a93d8b3bea37b981fd829e8139.fontdata"
+path="res://.godot/imported/font-josefin-sans.woff2-f1848192fffe0aa973b972af6b2bb0c4.fontdata"
 
 [deps]
 
-source_file="res://menu/theme/fonts/font-josefin-sans.woff2"
-dest_files=["res://.godot/imported/font-josefin-sans.woff2-3826b0a93d8b3bea37b981fd829e8139.fontdata"]
+source_file="res://gui/resources/fonts/font-josefin-sans.woff2"
+dest_files=["res://.godot/imported/font-josefin-sans.woff2-f1848192fffe0aa973b972af6b2bb0c4.fontdata"]
 
 [params]
 
diff --git a/client/menu/theme/fonts/font-sansita-swashed.woff2 b/client/gui/resources/fonts/font-sansita-swashed.woff2
index 5c665fb0..5c665fb0 100644
--- a/client/menu/theme/fonts/font-sansita-swashed.woff2
+++ b/client/gui/resources/fonts/font-sansita-swashed.woff2
diff --git a/client/menu/theme/fonts/font-sansita-swashed.woff2.import b/client/gui/resources/fonts/font-sansita-swashed.woff2.import
index c873b2da..7dab3339 100644
--- a/client/menu/theme/fonts/font-sansita-swashed.woff2.import
+++ b/client/gui/resources/fonts/font-sansita-swashed.woff2.import
@@ -3,12 +3,12 @@
 importer="font_data_dynamic"
 type="FontFile"
 uid="uid://bo4vh5xkpvrh1"
-path="res://.godot/imported/font-sansita-swashed.woff2-02fc401b56679ae18723df7cf0e77bd6.fontdata"
+path="res://.godot/imported/font-sansita-swashed.woff2-094d5cb1ef3d4e2539ac9238e4b7564c.fontdata"
 
 [deps]
 
-source_file="res://menu/theme/fonts/font-sansita-swashed.woff2"
-dest_files=["res://.godot/imported/font-sansita-swashed.woff2-02fc401b56679ae18723df7cf0e77bd6.fontdata"]
+source_file="res://gui/resources/fonts/font-sansita-swashed.woff2"
+dest_files=["res://.godot/imported/font-sansita-swashed.woff2-094d5cb1ef3d4e2539ac9238e4b7564c.fontdata"]
 
 [params]
 
diff --git a/client/menu/icons/arrow.svg b/client/gui/resources/icons/arrow.svg
index bafc9e69..bafc9e69 100644
--- a/client/menu/icons/arrow.svg
+++ b/client/gui/resources/icons/arrow.svg
diff --git a/client/menu/icons/arrow.svg.import b/client/gui/resources/icons/arrow.svg.import
index aa9ea355..5ea9e3c4 100644
--- a/client/menu/icons/arrow.svg.import
+++ b/client/gui/resources/icons/arrow.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://35rd5gamtyqm"
-path="res://.godot/imported/arrow.svg-4b2b120f303a2e998d242c78a6966282.ctex"
+path="res://.godot/imported/arrow.svg-5c6a786f82da6fec05fdd009d40f9e81.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/arrow.svg"
-dest_files=["res://.godot/imported/arrow.svg-4b2b120f303a2e998d242c78a6966282.ctex"]
+source_file="res://gui/resources/icons/arrow.svg"
+dest_files=["res://.godot/imported/arrow.svg-5c6a786f82da6fec05fdd009d40f9e81.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/arrow_focus.svg b/client/gui/resources/icons/arrow_focus.svg
index 456f0261..456f0261 100644
--- a/client/menu/icons/arrow_focus.svg
+++ b/client/gui/resources/icons/arrow_focus.svg
diff --git a/client/menu/icons/arrow_focus.svg.import b/client/gui/resources/icons/arrow_focus.svg.import
index 828846ad..e46a7698 100644
--- a/client/menu/icons/arrow_focus.svg.import
+++ b/client/gui/resources/icons/arrow_focus.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://by3qsrpxnfq4w"
-path="res://.godot/imported/arrow_focus.svg-54159cec20654fda644690185faf6883.ctex"
+path="res://.godot/imported/arrow_focus.svg-186cef816cf6f92795a6ffbcf94d9391.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/arrow_focus.svg"
-dest_files=["res://.godot/imported/arrow_focus.svg-54159cec20654fda644690185faf6883.ctex"]
+source_file="res://gui/resources/icons/arrow_focus.svg"
+dest_files=["res://.godot/imported/arrow_focus.svg-186cef816cf6f92795a6ffbcf94d9391.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/arrow_hover.svg b/client/gui/resources/icons/arrow_hover.svg
index 098063ec..098063ec 100644
--- a/client/menu/icons/arrow_hover.svg
+++ b/client/gui/resources/icons/arrow_hover.svg
diff --git a/client/menu/icons/arrow_hover.svg.import b/client/gui/resources/icons/arrow_hover.svg.import
index 44f2aab7..f750cbbc 100644
--- a/client/menu/icons/arrow_hover.svg.import
+++ b/client/gui/resources/icons/arrow_hover.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b33qmctbpf48g"
-path="res://.godot/imported/arrow_hover.svg-7a4a56e502ea35101b318789923c1f47.ctex"
+path="res://.godot/imported/arrow_hover.svg-c150da1cc405914a2d4c1388aea94f6b.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/arrow_hover.svg"
-dest_files=["res://.godot/imported/arrow_hover.svg-7a4a56e502ea35101b318789923c1f47.ctex"]
+source_file="res://gui/resources/icons/arrow_hover.svg"
+dest_files=["res://.godot/imported/arrow_hover.svg-c150da1cc405914a2d4c1388aea94f6b.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/arrow_pressed.svg b/client/gui/resources/icons/arrow_pressed.svg
index 1abd9a8f..1abd9a8f 100644
--- a/client/menu/icons/arrow_pressed.svg
+++ b/client/gui/resources/icons/arrow_pressed.svg
diff --git a/client/menu/icons/arrow_pressed.svg.import b/client/gui/resources/icons/arrow_pressed.svg.import
index 140e22d2..0cc07c10 100644
--- a/client/menu/icons/arrow_pressed.svg.import
+++ b/client/gui/resources/icons/arrow_pressed.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://j75dbytlbju"
-path="res://.godot/imported/arrow_pressed.svg-064136a9c6bd871ed0ad5fd10df7ddf7.ctex"
+path="res://.godot/imported/arrow_pressed.svg-72b6835d5e0ec811cf9d5e7abb401b66.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/arrow_pressed.svg"
-dest_files=["res://.godot/imported/arrow_pressed.svg-064136a9c6bd871ed0ad5fd10df7ddf7.ctex"]
+source_file="res://gui/resources/icons/arrow_pressed.svg"
+dest_files=["res://.godot/imported/arrow_pressed.svg-72b6835d5e0ec811cf9d5e7abb401b66.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/boost.webp b/client/gui/resources/icons/boost.webp
index afea92df..afea92df 100644
--- a/client/menu/icons/boost.webp
+++ b/client/gui/resources/icons/boost.webp
diff --git a/client/menu/icons/boost.webp.import b/client/gui/resources/icons/boost.webp.import
index a7c0768b..9fb9ddf8 100644
--- a/client/menu/icons/boost.webp.import
+++ b/client/gui/resources/icons/boost.webp.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bnxllatlo4clg"
-path="res://.godot/imported/boost.webp-650c006bc54ab6e0ac3213a966d84ecd.ctex"
+path="res://.godot/imported/boost.webp-877bfed2e298bb49bb39ce05f703e97f.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/boost.webp"
-dest_files=["res://.godot/imported/boost.webp-650c006bc54ab6e0ac3213a966d84ecd.ctex"]
+source_file="res://gui/resources/icons/boost.webp"
+dest_files=["res://.godot/imported/boost.webp-877bfed2e298bb49bb39ce05f703e97f.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/circle.svg b/client/gui/resources/icons/circle.svg
index 05fab1cb..05fab1cb 100644
--- a/client/menu/icons/circle.svg
+++ b/client/gui/resources/icons/circle.svg
diff --git a/client/menu/icons/circle.svg.import b/client/gui/resources/icons/circle.svg.import
index bb92ad4f..d49f9bc4 100644
--- a/client/menu/icons/circle.svg.import
+++ b/client/gui/resources/icons/circle.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://d2xf8qdh01e41"
-path="res://.godot/imported/circle.svg-f3244b3d13a0268ef24c94d9e07216c2.ctex"
+path="res://.godot/imported/circle.svg-87329764c20f8477bea7d035824f68a6.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/circle.svg"
-dest_files=["res://.godot/imported/circle.svg-f3244b3d13a0268ef24c94d9e07216c2.ctex"]
+source_file="res://gui/resources/icons/circle.svg"
+dest_files=["res://.godot/imported/circle.svg-87329764c20f8477bea7d035824f68a6.ctex"]
 
 [params]
 
diff --git a/client/menu/controller_buttons/x.svg b/client/gui/resources/icons/controller_x.svg
index 9a5df2ea..9a5df2ea 100644
--- a/client/menu/controller_buttons/x.svg
+++ b/client/gui/resources/icons/controller_x.svg
diff --git a/client/menu/controller_buttons/x.svg.import b/client/gui/resources/icons/controller_x.svg.import
index f9acb5ec..568c8672 100644
--- a/client/menu/controller_buttons/x.svg.import
+++ b/client/gui/resources/icons/controller_x.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bsx6fo7mv2u6a"
-path="res://.godot/imported/x.svg-94cb27dd83c134d85e2e1ce8d9481359.ctex"
+path="res://.godot/imported/controller_x.svg-84020d372efbd30d861ba44f5b1c1f7a.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/controller_buttons/x.svg"
-dest_files=["res://.godot/imported/x.svg-94cb27dd83c134d85e2e1ce8d9481359.ctex"]
+source_file="res://gui/resources/icons/controller_x.svg"
+dest_files=["res://.godot/imported/controller_x.svg-84020d372efbd30d861ba44f5b1c1f7a.ctex"]
 
 [params]
 
diff --git a/client/menu/controller_buttons/y.svg b/client/gui/resources/icons/controller_y.svg
index a378078b..a378078b 100644
--- a/client/menu/controller_buttons/y.svg
+++ b/client/gui/resources/icons/controller_y.svg
diff --git a/client/menu/controller_buttons/y.svg.import b/client/gui/resources/icons/controller_y.svg.import
index 5fec3cf1..f3f67231 100644
--- a/client/menu/controller_buttons/y.svg.import
+++ b/client/gui/resources/icons/controller_y.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cr2a6ide6vnnv"
-path="res://.godot/imported/y.svg-41b9f391c7719d6f019c38a3e4816a9f.ctex"
+path="res://.godot/imported/controller_y.svg-a116dee9a585fceb0e69cea069bc92d3.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/controller_buttons/y.svg"
-dest_files=["res://.godot/imported/y.svg-41b9f391c7719d6f019c38a3e4816a9f.ctex"]
+source_file="res://gui/resources/icons/controller_y.svg"
+dest_files=["res://.godot/imported/controller_y.svg-a116dee9a585fceb0e69cea069bc92d3.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/hint.svg b/client/gui/resources/icons/hint.svg
index ad64de91..ad64de91 100644
--- a/client/menu/icons/hint.svg
+++ b/client/gui/resources/icons/hint.svg
diff --git a/client/menu/icons/hint.svg.import b/client/gui/resources/icons/hint.svg.import
index e658d219..841acfb5 100644
--- a/client/menu/icons/hint.svg.import
+++ b/client/gui/resources/icons/hint.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b2uv5rf0enikf"
-path="res://.godot/imported/hint.svg-df98298ece507a1bda0092ad9e5243d5.ctex"
+path="res://.godot/imported/hint.svg-d7d8c196848a6c538326a5f8ec385b64.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/hint.svg"
-dest_files=["res://.godot/imported/hint.svg-df98298ece507a1bda0092ad9e5243d5.ctex"]
+source_file="res://gui/resources/icons/hint.svg"
+dest_files=["res://.godot/imported/hint.svg-d7d8c196848a6c538326a5f8ec385b64.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/interact.webp b/client/gui/resources/icons/interact.webp
index cf57c4c0..cf57c4c0 100644
--- a/client/menu/icons/interact.webp
+++ b/client/gui/resources/icons/interact.webp
diff --git a/client/menu/icons/interact.webp.import b/client/gui/resources/icons/interact.webp.import
index daf614c6..64d375eb 100644
--- a/client/menu/icons/interact.webp.import
+++ b/client/gui/resources/icons/interact.webp.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dcgt82qkya880"
-path="res://.godot/imported/interact.webp-8116b5d17f0ba3d9118b7be9331681ba.ctex"
+path="res://.godot/imported/interact.webp-ba4dc2c22b6ace23a59d368b045b45ae.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/interact.webp"
-dest_files=["res://.godot/imported/interact.webp-8116b5d17f0ba3d9118b7be9331681ba.ctex"]
+source_file="res://gui/resources/icons/interact.webp"
+dest_files=["res://.godot/imported/interact.webp-ba4dc2c22b6ace23a59d368b045b45ae.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/pause.webp b/client/gui/resources/icons/pause.webp
index 24ec72d8..24ec72d8 100644
--- a/client/menu/icons/pause.webp
+++ b/client/gui/resources/icons/pause.webp
diff --git a/client/menu/icons/pause.webp.import b/client/gui/resources/icons/pause.webp.import
index c15aee7b..a79d5b1e 100644
--- a/client/menu/icons/pause.webp.import
+++ b/client/gui/resources/icons/pause.webp.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://qto5rj6wlaeb"
-path="res://.godot/imported/pause.webp-dc4a5d6b868b49810e4c5551e3a25757.ctex"
+path="res://.godot/imported/pause.webp-59d9c713545753734e408e3bcfa465c6.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/pause.webp"
-dest_files=["res://.godot/imported/pause.webp-dc4a5d6b868b49810e4c5551e3a25757.ctex"]
+source_file="res://gui/resources/icons/pause.webp"
+dest_files=["res://.godot/imported/pause.webp-59d9c713545753734e408e3bcfa465c6.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/plus.svg b/client/gui/resources/icons/plus.svg
index c79169ba..c79169ba 100644
--- a/client/menu/icons/plus.svg
+++ b/client/gui/resources/icons/plus.svg
diff --git a/client/menu/icons/plus.svg.import b/client/gui/resources/icons/plus.svg.import
index f951a1af..98e9bf8e 100644
--- a/client/menu/icons/plus.svg.import
+++ b/client/gui/resources/icons/plus.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cnfjbowd2i02r"
-path="res://.godot/imported/plus.svg-84dacc0e61bf1916a177b38a64ba42e2.ctex"
+path="res://.godot/imported/plus.svg-5dcb9f0bf2e5a1c55b74537b98e2ec06.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/plus.svg"
-dest_files=["res://.godot/imported/plus.svg-84dacc0e61bf1916a177b38a64ba42e2.ctex"]
+source_file="res://gui/resources/icons/plus.svg"
+dest_files=["res://.godot/imported/plus.svg-5dcb9f0bf2e5a1c55b74537b98e2ec06.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/reset.svg b/client/gui/resources/icons/reset.svg
index 660d7759..660d7759 100644
--- a/client/menu/icons/reset.svg
+++ b/client/gui/resources/icons/reset.svg
diff --git a/client/menu/icons/reset.svg.import b/client/gui/resources/icons/reset.svg.import
index cecca8e4..16ba79b7 100644
--- a/client/menu/icons/reset.svg.import
+++ b/client/gui/resources/icons/reset.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://cucnmy0j5n8l8"
-path="res://.godot/imported/reset.svg-8a32af0c84ee1d00a467a7630ce0a918.ctex"
+path="res://.godot/imported/reset.svg-0004b05ae1181f52f03d82241e998f81.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/reset.svg"
-dest_files=["res://.godot/imported/reset.svg-8a32af0c84ee1d00a467a7630ce0a918.ctex"]
+source_file="res://gui/resources/icons/reset.svg"
+dest_files=["res://.godot/imported/reset.svg-0004b05ae1181f52f03d82241e998f81.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/select_directory.svg b/client/gui/resources/icons/select_directory.svg
index d3de2ef5..d3de2ef5 100644
--- a/client/menu/icons/select_directory.svg
+++ b/client/gui/resources/icons/select_directory.svg
diff --git a/client/menu/icons/select_directory.svg.import b/client/gui/resources/icons/select_directory.svg.import
index d32b1c0d..020fbd97 100644
--- a/client/menu/icons/select_directory.svg.import
+++ b/client/gui/resources/icons/select_directory.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://kxer318lo1oj"
-path="res://.godot/imported/select_directory.svg-53667a5eba564076594a4ae9632c9f83.ctex"
+path="res://.godot/imported/select_directory.svg-412137f7e6d959d951f8a9fb909150e5.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/select_directory.svg"
-dest_files=["res://.godot/imported/select_directory.svg-53667a5eba564076594a4ae9632c9f83.ctex"]
+source_file="res://gui/resources/icons/select_directory.svg"
+dest_files=["res://.godot/imported/select_directory.svg-412137f7e6d959d951f8a9fb909150e5.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/select_file.svg b/client/gui/resources/icons/select_file.svg
index f44866de..f44866de 100644
--- a/client/menu/icons/select_file.svg
+++ b/client/gui/resources/icons/select_file.svg
diff --git a/client/menu/icons/select_file.svg.import b/client/gui/resources/icons/select_file.svg.import
index 50661b4d..fe57469a 100644
--- a/client/menu/icons/select_file.svg.import
+++ b/client/gui/resources/icons/select_file.svg.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bsw8vqebvc38c"
-path="res://.godot/imported/select_file.svg-9e81fa4a5e1bd26cd59bfc2ac6696ce3.ctex"
+path="res://.godot/imported/select_file.svg-c2b2816e900869263e022805bb92f83c.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/select_file.svg"
-dest_files=["res://.godot/imported/select_file.svg-9e81fa4a5e1bd26cd59bfc2ac6696ce3.ctex"]
+source_file="res://gui/resources/icons/select_file.svg"
+dest_files=["res://.godot/imported/select_file.svg-c2b2816e900869263e022805bb92f83c.ctex"]
 
 [params]
 
diff --git a/client/menu/icons/user.webp b/client/gui/resources/icons/user.webp
index 5bba0540..5bba0540 100644
--- a/client/menu/icons/user.webp
+++ b/client/gui/resources/icons/user.webp
diff --git a/client/menu/icons/user.webp.import b/client/gui/resources/icons/user.webp.import
index 1b8fbb89..3a21e21d 100644
--- a/client/menu/icons/user.webp.import
+++ b/client/gui/resources/icons/user.webp.import
@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://222w1wha75od"
-path="res://.godot/imported/user.webp-de27cb424a236a023aa54d8999333695.ctex"
+path="res://.godot/imported/user.webp-0851517d1d18a09719e1adf5c0bc8b2e.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://menu/icons/user.webp"
-dest_files=["res://.godot/imported/user.webp-de27cb424a236a023aa54d8999333695.ctex"]
+source_file="res://gui/resources/icons/user.webp"
+dest_files=["res://.godot/imported/user.webp-0851517d1d18a09719e1adf5c0bc8b2e.ctex"]
 
 [params]
 
diff --git a/client/menu/theme/materials/blur_material.tres b/client/gui/resources/materials/blur_material.tres
index 035351c5..a0e9d58c 100644
--- a/client/menu/theme/materials/blur_material.tres
+++ b/client/gui/resources/materials/blur_material.tres
@@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://2j8a0c0a2ta5"]
 
-[ext_resource type="Shader" path="res://menu/theme/shaders/blur_mix.gdshader" id="1_d16rd"]
+[ext_resource type="Shader" uid="uid://cwldxegcj55if" path="res://gui/resources/shaders/blur_mix.gdshader" id="1_d16rd"]
 
 [resource]
 shader = ExtResource("1_d16rd")
diff --git a/client/menu/theme/materials/dark_blur_material.tres b/client/gui/resources/materials/dark_blur_material.tres
index cee1aeca..96cf1d3f 100644
--- a/client/menu/theme/materials/dark_blur_material.tres
+++ b/client/gui/resources/materials/dark_blur_material.tres
@@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://beea1pc5nt67r"]
 
-[ext_resource type="Shader" path="res://menu/theme/shaders/blur_mix.gdshader" id="1_cynu0"]
+[ext_resource type="Shader" uid="uid://cwldxegcj55if" path="res://gui/resources/shaders/blur_mix.gdshader" id="1_cynu0"]
 
 [resource]
 shader = ExtResource("1_cynu0")
diff --git a/client/menu/theme/materials/grayscale_material.tres b/client/gui/resources/materials/grayscale_material.tres
index 065356e5..236ad443 100644
--- a/client/menu/theme/materials/grayscale_material.tres
+++ b/client/gui/resources/materials/grayscale_material.tres
@@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://bplhkekj6rebp"]
 
-[ext_resource type="Shader" path="res://menu/theme/shaders/grayscale.gdshader" id="1_u0c2c"]
+[ext_resource type="Shader" uid="uid://qjrh2imc53u1" path="res://gui/resources/shaders/grayscale.gdshader" id="1_u0c2c"]
 
 [resource]
 shader = ExtResource("1_u0c2c")
diff --git a/client/menu/theme/materials/printed_material.tres b/client/gui/resources/materials/printed_material.tres
index 5695d5a5..3cc4a88c 100644
--- a/client/menu/theme/materials/printed_material.tres
+++ b/client/gui/resources/materials/printed_material.tres
@@ -1,6 +1,6 @@
 [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://dogdyoqrmy6ft"]
 
-[ext_resource type="Shader" path="res://menu/theme/shaders/printed.gdshader" id="1_sevww"]
+[ext_resource type="Shader" uid="uid://5p1xlwoc8qe5" path="res://gui/resources/shaders/printed.gdshader" id="1_sevww"]
 
 [resource]
 shader = ExtResource("1_sevww")
diff --git a/client/menu/theme/shaders/blur_mix.gdshader b/client/gui/resources/shaders/blur_mix.gdshader
index 97686a54..97686a54 100644
--- a/client/menu/theme/shaders/blur_mix.gdshader
+++ b/client/gui/resources/shaders/blur_mix.gdshader
diff --git a/client/menu/theme/shaders/blur_mix.gdshader.uid b/client/gui/resources/shaders/blur_mix.gdshader.uid
index 7279563b..7279563b 100644
--- a/client/menu/theme/shaders/blur_mix.gdshader.uid
+++ b/client/gui/resources/shaders/blur_mix.gdshader.uid
diff --git a/client/menu/theme/shaders/grayscale.gdshader b/client/gui/resources/shaders/grayscale.gdshader
index c058e7bf..c058e7bf 100644
--- a/client/menu/theme/shaders/grayscale.gdshader
+++ b/client/gui/resources/shaders/grayscale.gdshader
diff --git a/client/menu/theme/shaders/grayscale.gdshader.uid b/client/gui/resources/shaders/grayscale.gdshader.uid
index b721a6e0..b721a6e0 100644
--- a/client/menu/theme/shaders/grayscale.gdshader.uid
+++ b/client/gui/resources/shaders/grayscale.gdshader.uid
diff --git a/client/menu/textures/paper_texture.tres b/client/gui/resources/shaders/paper.tres
index 2c681244..2c681244 100644
--- a/client/menu/textures/paper_texture.tres
+++ b/client/gui/resources/shaders/paper.tres
diff --git a/client/menu/theme/shaders/printed.gdshader b/client/gui/resources/shaders/printed.gdshader
index c24cb679..c24cb679 100644
--- a/client/menu/theme/shaders/printed.gdshader
+++ b/client/gui/resources/shaders/printed.gdshader
diff --git a/client/menu/theme/shaders/printed.gdshader.uid b/client/gui/resources/shaders/printed.gdshader.uid
index 7c5fe12e..7c5fe12e 100644
--- a/client/menu/theme/shaders/printed.gdshader.uid
+++ b/client/gui/resources/shaders/printed.gdshader.uid
diff --git a/client/menu/sounds/click.ogg b/client/gui/resources/sounds/click.ogg
index db4aaf4e..db4aaf4e 100644
--- a/client/menu/sounds/click.ogg
+++ b/client/gui/resources/sounds/click.ogg
diff --git a/client/gui/resources/sounds/click.ogg.import b/client/gui/resources/sounds/click.ogg.import
new file mode 100644
index 00000000..4c4604ec
--- /dev/null
+++ b/client/gui/resources/sounds/click.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cpyn511c5mtni"
+path="res://.godot/imported/click.ogg-ec24cb35b5d300c7ddbb1f50c2522ac5.oggvorbisstr"
+
+[deps]
+
+source_file="res://gui/resources/sounds/click.ogg"
+dest_files=["res://.godot/imported/click.ogg-ec24cb35b5d300c7ddbb1f50c2522ac5.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/menu/sounds/failure.ogg b/client/gui/resources/sounds/failure.ogg
index ef6d6ea4..ef6d6ea4 100644
--- a/client/menu/sounds/failure.ogg
+++ b/client/gui/resources/sounds/failure.ogg
diff --git a/client/gui/resources/sounds/failure.ogg.import b/client/gui/resources/sounds/failure.ogg.import
new file mode 100644
index 00000000..495c1d96
--- /dev/null
+++ b/client/gui/resources/sounds/failure.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cv4isy6po6pqd"
+path="res://.godot/imported/failure.ogg-cf79159cd8bc7c6cb1fc08dc9f16fc65.oggvorbisstr"
+
+[deps]
+
+source_file="res://gui/resources/sounds/failure.ogg"
+dest_files=["res://.godot/imported/failure.ogg-cf79159cd8bc7c6cb1fc08dc9f16fc65.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/menu/sounds/game_start.ogg b/client/gui/resources/sounds/game_start.ogg
index 3282ff99..3282ff99 100644
--- a/client/menu/sounds/game_start.ogg
+++ b/client/gui/resources/sounds/game_start.ogg
diff --git a/client/gui/resources/sounds/game_start.ogg.import b/client/gui/resources/sounds/game_start.ogg.import
new file mode 100644
index 00000000..79e28ada
--- /dev/null
+++ b/client/gui/resources/sounds/game_start.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dft3m8utnxhs7"
+path="res://.godot/imported/game_start.ogg-94857aa980bf125ce248d75f3d2a8bc2.oggvorbisstr"
+
+[deps]
+
+source_file="res://gui/resources/sounds/game_start.ogg"
+dest_files=["res://.godot/imported/game_start.ogg-94857aa980bf125ce248d75f3d2a8bc2.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/menu/sounds/hover.ogg b/client/gui/resources/sounds/hover.ogg
index 17d414ca..17d414ca 100644
--- a/client/menu/sounds/hover.ogg
+++ b/client/gui/resources/sounds/hover.ogg
diff --git a/client/gui/resources/sounds/hover.ogg.import b/client/gui/resources/sounds/hover.ogg.import
new file mode 100644
index 00000000..0bb47b0d
--- /dev/null
+++ b/client/gui/resources/sounds/hover.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://dtr1khfyqr56o"
+path="res://.godot/imported/hover.ogg-604c32500c7d24a64b5d68b6146e31cc.oggvorbisstr"
+
+[deps]
+
+source_file="res://gui/resources/sounds/hover.ogg"
+dest_files=["res://.godot/imported/hover.ogg-604c32500c7d24a64b5d68b6146e31cc.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/menu/sounds/page.ogg b/client/gui/resources/sounds/page.ogg
index 3038a8d9..3038a8d9 100644
--- a/client/menu/sounds/page.ogg
+++ b/client/gui/resources/sounds/page.ogg
diff --git a/client/gui/resources/sounds/page.ogg.import b/client/gui/resources/sounds/page.ogg.import
new file mode 100644
index 00000000..9c65dc93
--- /dev/null
+++ b/client/gui/resources/sounds/page.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://do7ii5hx71p0m"
+path="res://.godot/imported/page.ogg-0b33370bdbe86f4cddfd8a42d8f62a5d.oggvorbisstr"
+
+[deps]
+
+source_file="res://gui/resources/sounds/page.ogg"
+dest_files=["res://.godot/imported/page.ogg-0b33370bdbe86f4cddfd8a42d8f62a5d.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/menu/sounds/sign.ogg b/client/gui/resources/sounds/sign.ogg
index 8811c50a..8811c50a 100644
--- a/client/menu/sounds/sign.ogg
+++ b/client/gui/resources/sounds/sign.ogg
diff --git a/client/gui/resources/sounds/sign.ogg.import b/client/gui/resources/sounds/sign.ogg.import
new file mode 100644
index 00000000..8e524403
--- /dev/null
+++ b/client/gui/resources/sounds/sign.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://5b3noxjmasmu"
+path="res://.godot/imported/sign.ogg-9091117f7048611453ca1b0853de53ea.oggvorbisstr"
+
+[deps]
+
+source_file="res://gui/resources/sounds/sign.ogg"
+dest_files=["res://.godot/imported/sign.ogg-9091117f7048611453ca1b0853de53ea.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/menu/sounds/success.ogg b/client/gui/resources/sounds/success.ogg
index 37cd2bcd..37cd2bcd 100644
--- a/client/menu/sounds/success.ogg
+++ b/client/gui/resources/sounds/success.ogg
diff --git a/client/gui/resources/sounds/success.ogg.import b/client/gui/resources/sounds/success.ogg.import
new file mode 100644
index 00000000..1c42b2e5
--- /dev/null
+++ b/client/gui/resources/sounds/success.ogg.import
@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://camy77x26mmpv"
+path="res://.godot/imported/success.ogg-d726a1955ea1a9943ae576d6eb7645bb.oggvorbisstr"
+
+[deps]
+
+source_file="res://gui/resources/sounds/success.ogg"
+dest_files=["res://.godot/imported/success.ogg-d726a1955ea1a9943ae576d6eb7645bb.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4
diff --git a/client/menu/theme/style/error_focus_style.tres b/client/gui/resources/style/error_focus_style.tres
index f7c44505..f7c44505 100644
--- a/client/menu/theme/style/error_focus_style.tres
+++ b/client/gui/resources/style/error_focus_style.tres
diff --git a/client/menu/theme/style/focus_style.tres b/client/gui/resources/style/focus_style.tres
index a01843fe..a01843fe 100644
--- a/client/menu/theme/style/focus_style.tres
+++ b/client/gui/resources/style/focus_style.tres
diff --git a/client/menu/theme/style/hover_style.tres b/client/gui/resources/style/hover_style.tres
index 963ee2ca..963ee2ca 100644
--- a/client/menu/theme/style/hover_style.tres
+++ b/client/gui/resources/style/hover_style.tres
diff --git a/client/menu/theme/style/item_bubble_progress_style.tres b/client/gui/resources/style/item_bubble_progress_style.tres
index 68054918..68054918 100644
--- a/client/menu/theme/style/item_bubble_progress_style.tres
+++ b/client/gui/resources/style/item_bubble_progress_style.tres
diff --git a/client/menu/theme/style/item_bubble_progress_style_background.tres b/client/gui/resources/style/item_bubble_progress_style_background.tres
index 972b7055..972b7055 100644
--- a/client/menu/theme/style/item_bubble_progress_style_background.tres
+++ b/client/gui/resources/style/item_bubble_progress_style_background.tres
diff --git a/client/menu/theme/style/lobby_panel_override.tres b/client/gui/resources/style/lobby_panel_override.tres
index 04fd16b0..04fd16b0 100644
--- a/client/menu/theme/style/lobby_panel_override.tres
+++ b/client/gui/resources/style/lobby_panel_override.tres
diff --git a/client/menu/theme/style/normal_style.tres b/client/gui/resources/style/normal_style.tres
index 96aecc8e..96aecc8e 100644
--- a/client/menu/theme/style/normal_style.tres
+++ b/client/gui/resources/style/normal_style.tres
diff --git a/client/menu/theme/style/panel_style.tres b/client/gui/resources/style/panel_style.tres
index d1f27667..d1f27667 100644
--- a/client/menu/theme/style/panel_style.tres
+++ b/client/gui/resources/style/panel_style.tres
diff --git a/client/menu/theme/style/panel_style_sidebar.tres b/client/gui/resources/style/panel_style_sidebar.tres
index 9615d88b..9615d88b 100644
--- a/client/menu/theme/style/panel_style_sidebar.tres
+++ b/client/gui/resources/style/panel_style_sidebar.tres
diff --git a/client/menu/theme/style/paper_panel_style.tres b/client/gui/resources/style/paper_panel_style.tres
index bd49eea4..effa2310 100644
--- a/client/menu/theme/style/paper_panel_style.tres
+++ b/client/gui/resources/style/paper_panel_style.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://bqhs5wtdp2oax"]
 
-[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://menu/textures/paper_texture.tres" id="1_u1kqj"]
+[ext_resource type="Texture2D" uid="uid://chxkwohi56cxx" path="res://gui/resources/shaders/paper.tres" id="1_u1kqj"]
 
 [resource]
 texture = ExtResource("1_u1kqj")
diff --git a/client/menu/theme/theme/paper.tres b/client/gui/resources/theme/paper.tres
index e141afd9..41417f39 100644
--- a/client/menu/theme/theme/paper.tres
+++ b/client/gui/resources/theme/paper.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Theme" load_steps=17 format=3 uid="uid://ci2qajdoa1an1"]
 
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="1_koj1m"]
-[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="1_tc8bk"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://gui/resources/fonts/font-sansita-swashed.woff2" id="1_koj1m"]
+[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://gui/resources/fonts/font-josefin-sans.woff2" id="1_tc8bk"]
 
 [sub_resource type="FontVariation" id="FontVariation_pirkj"]
 base_font = ExtResource("1_tc8bk")
diff --git a/client/menu/theme/theme/theme.tres b/client/gui/resources/theme/theme.tres
index b10c230a..ca87a81c 100644
--- a/client/menu/theme/theme/theme.tres
+++ b/client/gui/resources/theme/theme.tres
@@ -1,11 +1,11 @@
 [gd_resource type="Theme" load_steps=12 format=3 uid="uid://b0qmvo504e457"]
 
-[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="1_f8qb0"]
-[ext_resource type="StyleBox" uid="uid://b86kbd3pfkd5w" path="res://menu/theme/style/focus_style.tres" id="1_x88rs"]
-[ext_resource type="StyleBox" uid="uid://pi5uhe0lrgka" path="res://menu/theme/style/normal_style.tres" id="2_8fwoi"]
-[ext_resource type="StyleBox" uid="uid://dua4jqje3704w" path="res://menu/theme/style/hover_style.tres" id="2_ye28t"]
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="3_8u6ww"]
-[ext_resource type="StyleBox" uid="uid://bcd4xcvtv7tws" path="res://menu/theme/style/panel_style.tres" id="4_42dlp"]
+[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://gui/resources/fonts/font-josefin-sans.woff2" id="1_f8qb0"]
+[ext_resource type="StyleBox" uid="uid://b86kbd3pfkd5w" path="res://gui/resources/style/focus_style.tres" id="1_x88rs"]
+[ext_resource type="StyleBox" uid="uid://pi5uhe0lrgka" path="res://gui/resources/style/normal_style.tres" id="2_8fwoi"]
+[ext_resource type="StyleBox" uid="uid://dua4jqje3704w" path="res://gui/resources/style/hover_style.tres" id="2_ye28t"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://gui/resources/fonts/font-sansita-swashed.woff2" id="3_8u6ww"]
+[ext_resource type="StyleBox" uid="uid://bcd4xcvtv7tws" path="res://gui/resources/style/panel_style.tres" id="4_42dlp"]
 
 [sub_resource type="StyleBoxLine" id="StyleBoxLine_emtvk"]
 content_margin_top = 5.0
diff --git a/client/map/items/unknown_order.tscn b/client/map/items/unknown_order.tscn
index c4da1c50..24116387 100644
--- a/client/map/items/unknown_order.tscn
+++ b/client/map/items/unknown_order.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://dgg7srscxmtmy"]
 
-[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/fonts/font-sansita-swashed.woff2" id="1_3pq52"]
+[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://gui/resources/fonts/font-sansita-swashed.woff2" id="1_3pq52"]
 
 [sub_resource type="FontVariation" id="FontVariation_ligxx"]
 base_font = ExtResource("1_3pq52")
diff --git a/client/menu/back.svg.import b/client/menu/back.svg.import
deleted file mode 100644
index c1d3f246..00000000
--- a/client/menu/back.svg.import
+++ /dev/null
@@ -1,37 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://bho8snt36o47u"
-path="res://.godot/imported/back.svg-3e820259a1f002a01cdabc54e94ce8f4.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://menu/back.svg"
-dest_files=["res://.godot/imported/back.svg-3e820259a1f002a01cdabc54e94ce8f4.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1
-svg/scale=1.0
-editor/scale_with_editor_scale=false
-editor/convert_colors_with_editor_theme=false
diff --git a/client/menu/menu.tscn b/client/menu/menu.tscn
deleted file mode 100644
index 7a87e9b4..00000000
--- a/client/menu/menu.tscn
+++ /dev/null
@@ -1,8 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://bgo1j6isr7fdy"]
-
-[ext_resource type="Script" uid="uid://d2h2q16vykpl4" path="res://menu/menu.gd" id="1_le42d"]
-
-[node name="Menu" type="Control"]
-layout_mode = 3
-anchors_preset = 0
-script = ExtResource("1_le42d")
diff --git a/client/menu/sounds/click.ogg.import b/client/menu/sounds/click.ogg.import
deleted file mode 100644
index 965b171a..00000000
--- a/client/menu/sounds/click.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://cpyn511c5mtni"
-path="res://.godot/imported/click.ogg-e2bf88f5afe364b816ac9ff7e76a0967.oggvorbisstr"
-
-[deps]
-
-source_file="res://menu/sounds/click.ogg"
-dest_files=["res://.godot/imported/click.ogg-e2bf88f5afe364b816ac9ff7e76a0967.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git a/client/menu/sounds/failure.ogg.import b/client/menu/sounds/failure.ogg.import
deleted file mode 100644
index 78800693..00000000
--- a/client/menu/sounds/failure.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://cv4isy6po6pqd"
-path="res://.godot/imported/failure.ogg-4b523df8a2a2485852fc3b46f038f1af.oggvorbisstr"
-
-[deps]
-
-source_file="res://menu/sounds/failure.ogg"
-dest_files=["res://.godot/imported/failure.ogg-4b523df8a2a2485852fc3b46f038f1af.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git a/client/menu/sounds/game_start.ogg.import b/client/menu/sounds/game_start.ogg.import
deleted file mode 100644
index d5533df7..00000000
--- a/client/menu/sounds/game_start.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dft3m8utnxhs7"
-path="res://.godot/imported/game_start.ogg-7259109543b1a82c5ba32427a075813a.oggvorbisstr"
-
-[deps]
-
-source_file="res://menu/sounds/game_start.ogg"
-dest_files=["res://.godot/imported/game_start.ogg-7259109543b1a82c5ba32427a075813a.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git a/client/menu/sounds/hover.ogg.import b/client/menu/sounds/hover.ogg.import
deleted file mode 100644
index b83eab9d..00000000
--- a/client/menu/sounds/hover.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://dtr1khfyqr56o"
-path="res://.godot/imported/hover.ogg-45eb1351c35b416453fb2a6674b9d0f1.oggvorbisstr"
-
-[deps]
-
-source_file="res://menu/sounds/hover.ogg"
-dest_files=["res://.godot/imported/hover.ogg-45eb1351c35b416453fb2a6674b9d0f1.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git a/client/menu/sounds/page.ogg.import b/client/menu/sounds/page.ogg.import
deleted file mode 100644
index fd8e6c33..00000000
--- a/client/menu/sounds/page.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://do7ii5hx71p0m"
-path="res://.godot/imported/page.ogg-86ebebfa0b524519c151e7cdcdb0af05.oggvorbisstr"
-
-[deps]
-
-source_file="res://menu/sounds/page.ogg"
-dest_files=["res://.godot/imported/page.ogg-86ebebfa0b524519c151e7cdcdb0af05.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git a/client/menu/sounds/sign.ogg.import b/client/menu/sounds/sign.ogg.import
deleted file mode 100644
index 962a9a8e..00000000
--- a/client/menu/sounds/sign.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://5b3noxjmasmu"
-path="res://.godot/imported/sign.ogg-c12a072ad1fde3097195d6a4f4f3cd80.oggvorbisstr"
-
-[deps]
-
-source_file="res://menu/sounds/sign.ogg"
-dest_files=["res://.godot/imported/sign.ogg-c12a072ad1fde3097195d6a4f4f3cd80.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git a/client/menu/sounds/success.ogg.import b/client/menu/sounds/success.ogg.import
deleted file mode 100644
index a9a11f60..00000000
--- a/client/menu/sounds/success.ogg.import
+++ /dev/null
@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://camy77x26mmpv"
-path="res://.godot/imported/success.ogg-e38685f2806ef7e0cf55f48c7c208873.oggvorbisstr"
-
-[deps]
-
-source_file="res://menu/sounds/success.ogg"
-dest_files=["res://.godot/imported/success.ogg-e38685f2806ef7e0cf55f48c7c208873.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
diff --git a/client/player/chat_message.tscn b/client/player/chat_message.tscn
index 287891d5..b91dcba4 100644
--- a/client/player/chat_message.tscn
+++ b/client/player/chat_message.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://5rcfoyuiwuya"]
 
-[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://menu/theme/fonts/font-josefin-sans.woff2" id="1_3ximm"]
+[ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://gui/resources/fonts/font-josefin-sans.woff2" id="1_3ximm"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dpele"]
 bg_color = Color(1, 1, 1, 1)
diff --git a/client/player/item_bubble.gd b/client/player/item_bubble.gd
index 4c6636cd..e02272b7 100644
--- a/client/player/item_bubble.gd
+++ b/client/player/item_bubble.gd
@@ -19,7 +19,7 @@ extends MeshInstance3D
 var item: Item
 var timeout_remaining := 0.
 var timeout_initial := 0.
-var progress_style = preload("res://menu/theme/style/item_bubble_progress_style.tres")
+var progress_style = preload("res://gui/resources/style/item_bubble_progress_style.tres")
 
 @onready var item_message = $SubViewport/ItemMessage
 
diff --git a/client/player/item_bubble.tscn b/client/player/item_bubble.tscn
index 385f2770..36d01b28 100644
--- a/client/player/item_bubble.tscn
+++ b/client/player/item_bubble.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=3 uid="uid://cj777mi5nok6c"]
 
 [ext_resource type="Script" uid="uid://c34w2snsabjqp" path="res://player/item_bubble.gd" id="1_84g24"]
-[ext_resource type="PackedScene" uid="uid://fkqh36s4vl3p" path="res://menu/communicate/item/item_message.tscn" id="2_hgmra"]
+[ext_resource type="PackedScene" uid="uid://fkqh36s4vl3p" path="res://gui/components/message/item/item_message.tscn" id="2_hgmra"]
 
 [sub_resource type="QuadMesh" id="QuadMesh_tlsxo"]
 
diff --git a/client/player/onscreen_controls/controls.tscn b/client/player/onscreen_controls/controls.tscn
index 25dfdad9..2f88ee6a 100644
--- a/client/player/onscreen_controls/controls.tscn
+++ b/client/player/onscreen_controls/controls.tscn
@@ -2,9 +2,9 @@
 
 [ext_resource type="PackedScene" uid="uid://dmr0fcamx7t56" path="res://player/onscreen_controls/virtual_joystick_scene.tscn" id="1_4k4lh"]
 [ext_resource type="Script" uid="uid://b25j7ua3og5rh" path="res://player/onscreen_controls/controls.gd" id="1_rnoki"]
-[ext_resource type="Texture2D" uid="uid://bnxllatlo4clg" path="res://menu/icons/boost.webp" id="2_i4ife"]
-[ext_resource type="Texture2D" uid="uid://dcgt82qkya880" path="res://menu/icons/interact.webp" id="3_37rne"]
-[ext_resource type="Texture2D" uid="uid://qto5rj6wlaeb" path="res://menu/icons/pause.webp" id="5_4bttq"]
+[ext_resource type="Texture2D" uid="uid://bnxllatlo4clg" path="res://gui/resources/icons/boost.webp" id="2_i4ife"]
+[ext_resource type="Texture2D" uid="uid://dcgt82qkya880" path="res://gui/resources/icons/interact.webp" id="3_37rne"]
+[ext_resource type="Texture2D" uid="uid://qto5rj6wlaeb" path="res://gui/resources/icons/pause.webp" id="5_4bttq"]
 
 [node name="UI" type="CanvasLayer"]
 script = ExtResource("1_rnoki")
diff --git a/client/player/particles/effect.tscn b/client/player/particles/effect.tscn
index fc627289..9f77476d 100644
--- a/client/player/particles/effect.tscn
+++ b/client/player/particles/effect.tscn
@@ -2,8 +2,8 @@
 
 [ext_resource type="Script" uid="uid://ecsoi03822i5" path="res://player/particles/effect.gd" id="1_aqsk6"]
 [ext_resource type="PackedScene" uid="uid://yaed1vnhd0aa" path="res://player/particles/satisfied/stars.tscn" id="2_shb5l"]
-[ext_resource type="AudioStream" uid="uid://camy77x26mmpv" path="res://menu/sounds/success.ogg" id="3_favyn"]
-[ext_resource type="AudioStream" uid="uid://cv4isy6po6pqd" path="res://menu/sounds/failure.ogg" id="4_j38qf"]
+[ext_resource type="AudioStream" uid="uid://camy77x26mmpv" path="res://gui/resources/sounds/success.ogg" id="3_favyn"]
+[ext_resource type="AudioStream" uid="uid://cv4isy6po6pqd" path="res://gui/resources/sounds/failure.ogg" id="4_j38qf"]
 [ext_resource type="PackedScene" uid="uid://cvty1rwt52anq" path="res://player/angry.tscn" id="4_uxxex"]
 [ext_resource type="Script" uid="uid://n4jwod1jfuiv" path="res://audio/play_random.gd" id="5_t2upj"]
 [ext_resource type="AudioStream" uid="uid://c3gatgrsb0npf" path="res://player/sounds/angry1.ogg" id="6_ou7uy"]
diff --git a/client/project.godot b/client/project.godot
index 783850b8..56af7dca 100644
--- a/client/project.godot
+++ b/client/project.godot
@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="hurrycurry"
-run/main_scene="res://menu/entry.tscn"
+run/main_scene="res://gui/menus/entry.tscn"
 config/quit_on_go_back=false
 config/features=PackedStringArray("4.4", "Forward Plus")
 boot_splash/image="res://icons/main.png"
@@ -23,7 +23,7 @@ TranslationManager="*res://translation_manager.gd"
 Global="*res://global.gd"
 Sound="*res://audio/sound.tscn"
 DisableWrongJoypads="*res://disable_wrong_joypads.gd"
-InputManager="*res://menu/settings/input/input_manager.gd"
+InputManager="*res://gui/menus/settings/input/input_manager.gd"
 ServerList="*res://server_list.gd"
 Server="*res://service/server.gd"
 Editor="*res://service/editor.gd"
@@ -43,6 +43,7 @@ display_server/driver.linuxbsd="wayland"
 
 [editor]
 
+movie_writer/mjpeg_quality=0.9
 movie_writer/movie_file="/tmp/output.avi"
 
 [input]
diff --git a/client/settings.gd b/client/settings.gd
index e7d3092e..fa400821 100644
--- a/client/settings.gd
+++ b/client/settings.gd
@@ -104,7 +104,7 @@ static func get_category_dict(prefix: String):
 	return map
 
 static func launch_setup():
-	Global.focused_menu.submenu("res://menu/setup.tscn")
+	Global.focused_menu.submenu("res://gui/menus/setup/setup.tscn")
 
 static var change_hooks_display = {}
 static var change_hooks_apply = {