diff --git a/game/_development/ayuroo/maestro/_mo_chase_test.tscn b/game/_development/ayuroo/maestro/_mo_chase_test.tscn
index d162478..6fd899f 100644
--- a/game/_development/ayuroo/maestro/_mo_chase_test.tscn
+++ b/game/_development/ayuroo/maestro/_mo_chase_test.tscn
@@ -38,7 +38,7 @@ audio_player = NodePath("../Music")
 metadata/_custom_type_script = "uid://byqenxfb1srrp"
 
 [node name="CameraRoot" type="Node3D" parent="." unique_id=949164518]
-transform = Transform3D(0.99999887, 0, 0, 0, 0.99999887, 0, 0, 0, 0.99999887, 0, 1, -36.72871)
+transform = Transform3D(0.99999887, 0, 0, 0, 0.99999887, 0, 0, 0, 0.99999887, 0, 1, 0)
 
 [node name="Camera3D" type="Camera3D" parent="CameraRoot" unique_id=1314945714]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 2, 0, 0)
diff --git a/game/addons/Todo_Manager/ColourPicker.gd b/game/addons/Todo_Manager/ColourPicker.gd
index 39a3f9a..6ea9063 100644
--- a/game/addons/Todo_Manager/ColourPicker.gd
+++ b/game/addons/Todo_Manager/ColourPicker.gd
@@ -14,4 +14,4 @@ func _ready() -> void:
 
 func set_title(value: String) -> void:
 	title = value
-	$Label.text = value 
+	$Label.text = value
diff --git a/game/addons/Todo_Manager/Dock.gd b/game/addons/Todo_Manager/Dock.gd
index c417325..e636504 100644
--- a/game/addons/Todo_Manager/Dock.gd
+++ b/game/addons/Todo_Manager/Dock.gd
@@ -78,7 +78,7 @@ func get_active_script() -> TodoItem:
 		for todo_item in todo_items:
 			if todo_item.script_path == script_path:
 				return todo_item
-		
+
 		# nothing found
 		var todo_item := TodoItem.new(script_path, [])
 		return todo_item
@@ -102,20 +102,20 @@ func go_to_script(script_path: String, line_number : int = 0) -> void:
 func get_exec_flags(editor_path : String, script_path : String, line_number : int) -> PackedStringArray:
 	var args : PackedStringArray
 	var script_global_path = ProjectSettings.globalize_path(script_path)
-	
+
 	if editor_path.ends_with("code.cmd") or editor_path.ends_with("code"): ## VS Code
 		args.append(ProjectSettings.globalize_path("res://"))
 		args.append("--goto")
 		args.append(script_global_path +  ":" + str(line_number))
-	
+
 	elif editor_path.ends_with("rider64.exe") or editor_path.ends_with("rider"): ## Rider
 		args.append("--line")
 		args.append(str(line_number))
 		args.append(script_global_path)
-		
+
 	else: ## Atom / Sublime
 		args.append(script_global_path + ":" + str(line_number))
-	
+
 	return args
 
 
@@ -142,7 +142,7 @@ func populate_settings() -> void:
 		colour_picker.index = i
 		colours_container.add_child(colour_picker)
 		colour_picker.colour_picker.color_changed.connect(change_colour.bind(i))
-		
+
 		## Create Patterns
 		var pattern_edit: PatternEdit = PatternEditScene.instantiate()
 		pattern_edit.text = patterns[i][0]
@@ -154,10 +154,10 @@ func populate_settings() -> void:
 				pattern_edit, colour_picker))
 		pattern_edit.case_checkbox.button_pressed = patterns[i][2]
 		pattern_edit.case_checkbox.toggled.connect(case_sensitive_pattern.bind(i))
-		
+
 	var pattern_button := $VBoxContainer/TabContainer/Settings/ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer4/Patterns/AddPatternButton
 	$VBoxContainer/TabContainer/Settings/ScrollContainer/MarginContainer/VBoxContainer/HBoxContainer4/Patterns.move_child(pattern_button, 0)
-	
+
 	# path filtering
 	var ignore_paths_field := ignore_textbox
 	if not ignore_paths_field.is_connected("text_changed", _on_ignore_paths_changed):
@@ -167,11 +167,11 @@ func populate_settings() -> void:
 		ignore_paths_text += path + ", "
 	ignore_paths_text = ignore_paths_text.trim_suffix(", ")
 	ignore_paths_field.text = ignore_paths_text
-	
+
 	auto_refresh_button.button_pressed = auto_refresh
 	show_count_button.button_pressed = show_count
 	scan_builtin_scripts_button.button_pressed = builtin_enabled
-	
+
 
 
 func rebuild_settings() -> void:
@@ -202,18 +202,18 @@ func add_toggle_buttons() -> void:
 #### CONFIG FILE ####
 func create_config_file() -> void:
 	var config = ConfigFile.new()
-	
+
 	config.set_value("scripts", "full_path", full_path)
 	config.set_value("scripts", "sort_alphabetical", _sort_alphabetical)
 	config.set_value("scripts", "script_colour", script_colour)
 	config.set_value("scripts", "ignore_paths", ignore_paths)
-	
+
 	config.set_value("patterns", "patterns", patterns)
-	
+
 	config.set_value("config", "auto_refresh", auto_refresh)
 	config.set_value("config", "show_count", show_count)
 	config.set_value("config", "builtin_enabled", builtin_enabled)
-	
+
 	var err = config.save("res://addons/Todo_Manager/todo.cfg")
 
 
@@ -255,7 +255,7 @@ func _on_Tree_item_activated() -> void:
 	match tabs.current_tab:
 		0:
 			item = project_tree.get_selected()
-		1: 
+		1:
 			item = current_tree.get_selected()
 	if item.get_metadata(0) is Todo:
 		var todo : Todo = item.get_metadata(0)
@@ -325,7 +325,7 @@ func _on_ignore_paths_changed(new_text: String) -> void:
 	var split: Array = text.split(',')
 	ignore_paths.clear()
 	for elem in split:
-		if elem == " " || elem == "": 
+		if elem == " " || elem == "":
 			continue
 		ignore_paths.push_front(elem.lstrip(' ').rstrip(' '))
 	# validate so no empty string slips through (all paths ignored)
diff --git a/game/addons/Todo_Manager/UI/ColourPicker.tscn b/game/addons/Todo_Manager/UI/ColourPicker.tscn
index d70381d..3e0a1ec 100644
--- a/game/addons/Todo_Manager/UI/ColourPicker.tscn
+++ b/game/addons/Todo_Manager/UI/ColourPicker.tscn
@@ -1,17 +1,17 @@
-[gd_scene load_steps=2 format=3 uid="uid://bie1xn8v1kd66"]
+[gd_scene format=3 uid="uid://bie1xn8v1kd66"]
 
 [ext_resource type="Script" uid="uid://dd033y6smf6jh" path="res://addons/Todo_Manager/ColourPicker.gd" id="1"]
 
-[node name="TODOColour" type="HBoxContainer"]
+[node name="TODOColour" type="HBoxContainer" unique_id=2078511682]
 offset_right = 105.0
 offset_bottom = 31.0
 script = ExtResource("1")
 metadata/_edit_use_custom_anchors = false
 
-[node name="Label" type="Label" parent="."]
+[node name="Label" type="Label" parent="." unique_id=1101254785]
 layout_mode = 2
 
-[node name="TODOColourPickerButton" type="ColorPickerButton" parent="."]
+[node name="TODOColourPickerButton" type="ColorPickerButton" parent="." unique_id=102671264]
 custom_minimum_size = Vector2(40, 0)
 layout_mode = 2
 size_flags_horizontal = 10
diff --git a/game/addons/Todo_Manager/UI/FlatToggleButton.tres b/game/addons/Todo_Manager/UI/FlatToggleButton.tres
index 70238d1..52fd1da 100644
--- a/game/addons/Todo_Manager/UI/FlatToggleButton.tres
+++ b/game/addons/Todo_Manager/UI/FlatToggleButton.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=4 format=3 uid="uid://cignxcqjqfst0"]
+[gd_resource type="Theme" format=3 uid="uid://cignxcqjqfst0"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_0amm0"]
 bg_color = Color(1, 1, 1, 0.0784314)
diff --git a/game/addons/Todo_Manager/UI/PatternEdit.tscn b/game/addons/Todo_Manager/UI/PatternEdit.tscn
index 6ab0c6a..6d4932a 100644
--- a/game/addons/Todo_Manager/UI/PatternEdit.tscn
+++ b/game/addons/Todo_Manager/UI/PatternEdit.tscn
@@ -1,25 +1,25 @@
-[gd_scene load_steps=2 format=3 uid="uid://bx11sel2q5wli"]
+[gd_scene format=3 uid="uid://bx11sel2q5wli"]
 
 [ext_resource type="Script" uid="uid://betg01sk02eyy" path="res://addons/Todo_Manager/PatternEdit.gd" id="1_mujq6"]
 
-[node name="Pattern" type="HBoxContainer"]
+[node name="Pattern" type="HBoxContainer" unique_id=1886870873]
 script = ExtResource("1_mujq6")
 
-[node name="LineEdit" type="LineEdit" parent="."]
+[node name="LineEdit" type="LineEdit" parent="." unique_id=2143900590]
 layout_mode = 2
 size_flags_horizontal = 0
 expand_to_text_length = true
 
-[node name="RemoveButton" type="Button" parent="."]
+[node name="RemoveButton" type="Button" parent="." unique_id=2067766864]
 layout_mode = 2
 text = "-"
 
-[node name="MarginContainer" type="MarginContainer" parent="."]
+[node name="MarginContainer" type="MarginContainer" parent="." unique_id=922685136]
 custom_minimum_size = Vector2(20, 0)
 layout_mode = 2
 size_flags_horizontal = 0
 
-[node name="CaseSensativeCheckbox" type="CheckBox" parent="."]
+[node name="CaseSensativeCheckbox" type="CheckBox" parent="." unique_id=2108159862]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 0
diff --git a/game/addons/Todo_Manager/UI/ToggleButton.tscn b/game/addons/Todo_Manager/UI/ToggleButton.tscn
index c5c7609..01ad5e2 100644
--- a/game/addons/Todo_Manager/UI/ToggleButton.tscn
+++ b/game/addons/Todo_Manager/UI/ToggleButton.tscn
@@ -1,13 +1,6 @@
-[gd_scene load_steps=5 format=3 uid="uid://bq0tjjng7hdvt"]
+[gd_scene format=3 uid="uid://bq0tjjng7hdvt"]
 
-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_5887s"]
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rtgj1"]
-bg_color = Color(1, 1, 1, 0.0705882)
-corner_radius_top_left = 4
-corner_radius_top_right = 4
-corner_radius_bottom_right = 4
-corner_radius_bottom_left = 4
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_f41nr"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5887s"]
 bg_color = Color(0.12549, 0.156863, 0.192157, 1)
@@ -18,12 +11,19 @@ corner_radius_top_right = 4
 corner_radius_bottom_right = 4
 corner_radius_bottom_left = 4
 
-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_f41nr"]
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rtgj1"]
+bg_color = Color(1, 1, 1, 0.0705882)
+corner_radius_top_left = 4
+corner_radius_top_right = 4
+corner_radius_bottom_right = 4
+corner_radius_bottom_left = 4
 
-[node name="Button" type="Button"]
-theme_override_styles/focus = SubResource("StyleBoxEmpty_5887s")
-theme_override_styles/hover = SubResource("StyleBoxFlat_rtgj1")
-theme_override_styles/pressed = SubResource("StyleBoxFlat_5887s")
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_5887s"]
+
+[node name="Button" type="Button" unique_id=1856473385]
 theme_override_styles/normal = SubResource("StyleBoxEmpty_f41nr")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_5887s")
+theme_override_styles/hover = SubResource("StyleBoxFlat_rtgj1")
+theme_override_styles/focus = SubResource("StyleBoxEmpty_5887s")
 toggle_mode = true
 text = "TODO"
diff --git a/game/addons/Todo_Manager/doc/images/example1.png.import b/game/addons/Todo_Manager/doc/images/example1.png.import
index a3c767f..d466d9d 100644
--- a/game/addons/Todo_Manager/doc/images/example1.png.import
+++ b/game/addons/Todo_Manager/doc/images/example1.png.import
@@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/example1.png-6386c332ca46e1e62ea061b956a901cd
 compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
@@ -25,6 +27,10 @@ mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/normal_map_invert_y=false
diff --git a/game/addons/controller_icons/ControllerIcons.gd b/game/addons/controller_icons/ControllerIcons.gd
index b7a6cf4..daaadec 100644
--- a/game/addons/controller_icons/ControllerIcons.gd
+++ b/game/addons/controller_icons/ControllerIcons.gd
@@ -287,7 +287,7 @@ func get_matching_event(path: String, input_type: InputType = _last_input_type,
 					# Use the first device specific mapping if there is one.
 					if event.device == controller:
 						return event
-					# Otherwise, we create a fallback prioritizing events with 'ALL_DEVICE' 
+					# Otherwise, we create a fallback prioritizing events with 'ALL_DEVICE'
 					if event.device < 0: # All-device event
 						fallbacks.push_front(event)
 					else:
diff --git a/game/addons/controller_icons/objects/ControllerIconPathSelector.gd b/game/addons/controller_icons/objects/ControllerIconPathSelector.gd
index f6caf42..e44f2f4 100644
--- a/game/addons/controller_icons/objects/ControllerIconPathSelector.gd
+++ b/game/addons/controller_icons/objects/ControllerIconPathSelector.gd
@@ -16,11 +16,11 @@ var editor_interface : EditorInterface
 
 func populate(editor_interface: EditorInterface) -> void:
 	self.editor_interface = editor_interface
-	
+
 	input_action_populated = false
 	joypad_path_populated = false
 	specific_path_populated = false
-	
+
 	n_tab_container.current_tab = 0
 
 func get_icon_path() -> String:
@@ -28,6 +28,9 @@ func get_icon_path() -> String:
 
 
 func _on_tab_container_tab_selected(tab = null) -> void:
+	if not is_instance_valid(n_tab_container):
+		return
+
 	match n_tab_container.get_current_tab_control():
 		n_input_action:
 			if not input_action_populated:
diff --git a/game/addons/controller_icons/objects/ControllerIconPathSelector.tscn b/game/addons/controller_icons/objects/ControllerIconPathSelector.tscn
index 80593c5..5e4a019 100644
--- a/game/addons/controller_icons/objects/ControllerIconPathSelector.tscn
+++ b/game/addons/controller_icons/objects/ControllerIconPathSelector.tscn
@@ -1,11 +1,11 @@
-[gd_scene load_steps=5 format=3 uid="uid://dijn7haax0boi"]
+[gd_scene format=3 uid="uid://dijn7haax0boi"]
 
-[ext_resource type="Script" path="res://addons/controller_icons/objects/ControllerIconPathSelector.gd" id="1_0ucf4"]
+[ext_resource type="Script" uid="uid://dmn34qxh8qhxl" path="res://addons/controller_icons/objects/ControllerIconPathSelector.gd" id="1_0ucf4"]
 [ext_resource type="PackedScene" uid="uid://bituity863qe4" path="res://addons/controller_icons/objects/path_selection/input_action.tscn" id="2_wlqmh"]
 [ext_resource type="PackedScene" uid="uid://b3lplrf2w6kh7" path="res://addons/controller_icons/objects/path_selection/joypad_path.tscn" id="3_6ffwr"]
 [ext_resource type="PackedScene" uid="uid://d2ow6e2ba86b6" path="res://addons/controller_icons/objects/path_selection/specific_path.tscn" id="4_3ai5v"]
 
-[node name="ControllerIconPathSelector" type="PanelContainer"]
+[node name="ControllerIconPathSelector" type="PanelContainer" unique_id=1020244822]
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -13,27 +13,31 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_0ucf4")
 
-[node name="TabContainer" type="TabContainer" parent="."]
+[node name="TabContainer" type="TabContainer" parent="." unique_id=447252944]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(850, 450)
 layout_mode = 2
 size_flags_horizontal = 3
 theme_override_constants/side_margin = 0
 tab_alignment = 1
+current_tab = 0
 
-[node name="Input Action" parent="TabContainer" instance=ExtResource("2_wlqmh")]
+[node name="Input Action" parent="TabContainer" unique_id=2021676046 instance=ExtResource("2_wlqmh")]
 unique_name_in_owner = true
 layout_mode = 2
+metadata/_tab_index = 0
 
-[node name="Joypad Path" parent="TabContainer" instance=ExtResource("3_6ffwr")]
+[node name="Joypad Path" parent="TabContainer" unique_id=1745344230 instance=ExtResource("3_6ffwr")]
 unique_name_in_owner = true
 visible = false
 layout_mode = 2
+metadata/_tab_index = 1
 
-[node name="Specific Path" parent="TabContainer" instance=ExtResource("4_3ai5v")]
+[node name="Specific Path" parent="TabContainer" unique_id=1227352151 instance=ExtResource("4_3ai5v")]
 unique_name_in_owner = true
 visible = false
 layout_mode = 2
+metadata/_tab_index = 2
 
 [connection signal="tab_selected" from="TabContainer" to="." method="_on_tab_container_tab_selected"]
 [connection signal="done" from="TabContainer/Input Action" to="." method="_on_input_action_done"]
diff --git a/game/addons/controller_icons/objects/ControllerIconPathSelectorPopup.tscn b/game/addons/controller_icons/objects/ControllerIconPathSelectorPopup.tscn
index b330223..8c25bf5 100644
--- a/game/addons/controller_icons/objects/ControllerIconPathSelectorPopup.tscn
+++ b/game/addons/controller_icons/objects/ControllerIconPathSelectorPopup.tscn
@@ -1,16 +1,17 @@
-[gd_scene load_steps=3 format=3 uid="uid://ib8ydhcaklwy"]
+[gd_scene format=3 uid="uid://ib8ydhcaklwy"]
 
-[ext_resource type="Script" path="res://addons/controller_icons/objects/ControllerIconPathSelectorPopup.gd" id="1_6s0ph"]
+[ext_resource type="Script" uid="uid://dfnjre1sbxssv" path="res://addons/controller_icons/objects/ControllerIconPathSelectorPopup.gd" id="1_6s0ph"]
 [ext_resource type="PackedScene" uid="uid://dijn7haax0boi" path="res://addons/controller_icons/objects/ControllerIconPathSelector.tscn" id="2_gfs7t"]
 
-[node name="ControllerIconPathSelectorPopup" type="ConfirmationDialog"]
+[node name="ControllerIconPathSelectorPopup" type="ConfirmationDialog" unique_id=1459972447]
+oversampling_override = 1.0
 title = "Select an icon path"
 position = Vector2i(0, 36)
 size = Vector2i(866, 507)
 visible = true
 script = ExtResource("1_6s0ph")
 
-[node name="ControllerIconPathSelector" parent="." instance=ExtResource("2_gfs7t")]
+[node name="ControllerIconPathSelector" parent="." unique_id=1448305940 instance=ExtResource("2_gfs7t")]
 offset_left = 8.0
 offset_top = 8.0
 offset_right = -8.0
diff --git a/game/addons/controller_icons/objects/ControllerIconTexture.gd b/game/addons/controller_icons/objects/ControllerIconTexture.gd
index f3abbe3..8171ed6 100644
--- a/game/addons/controller_icons/objects/ControllerIconTexture.gd
+++ b/game/addons/controller_icons/objects/ControllerIconTexture.gd
@@ -61,7 +61,7 @@ enum ShowMode {
 	CONTROLLER ## Icon will be display only when a controller is being used.
 }
 
-## Show the icon only if a specific input method is being used. When hidden, 
+## Show the icon only if a specific input method is being used. When hidden,
 ## the icon will not occupy have any space (no width and height).
 @export var show_mode: ShowMode = ShowMode.ANY:
 	set(_show_mode):
@@ -207,10 +207,10 @@ func _load_texture_path_impl():
 	if ControllerIcons.is_node_ready() and _can_be_shown():
 		var input_type = ControllerIcons._last_input_type if force_type == ForceType.NONE else force_type - 1
 		if ControllerIcons.get_path_type(path) == ControllerIcons.PathType.INPUT_ACTION:
-			var event := ControllerIcons.get_matching_event(path, input_type)
+			var event: Variant = ControllerIcons.get_matching_event(path, input_type)
 			textures.append_array(ControllerIcons.parse_event_modifiers(event))
 		var target_device = force_device if force_device != ForceDevice.ANY else ControllerIcons._last_controller
-		var tex := ControllerIcons.parse_path(path, input_type, target_device, force_controller_icon_style)
+		var tex: Variant = ControllerIcons.parse_path(path, input_type, target_device, force_controller_icon_style)
 		if tex:
 			textures.append(tex)
 	_textures = textures
@@ -348,7 +348,7 @@ func _draw_rect_region(to_canvas_item: RID, rect: Rect2, src_rect: Rect2, modula
 
 func _draw_text(to_canvas_item: RID, font_position: Vector2, text: String):
 	font_position.y += _font.get_ascent(_label_settings.font_size)
-	
+
 	if _label_settings.shadow_color.a > 0:
 		_font.draw_string(to_canvas_item, font_position + _label_settings.shadow_offset, text, HORIZONTAL_ALIGNMENT_LEFT, -1, _label_settings.font_size, _label_settings.shadow_color)
 		if _label_settings.shadow_size > 0:
diff --git a/game/addons/controller_icons/objects/path_selection/InputActionSelector.gd b/game/addons/controller_icons/objects/path_selection/InputActionSelector.gd
index 5850d94..ba6e265 100644
--- a/game/addons/controller_icons/objects/path_selection/InputActionSelector.gd
+++ b/game/addons/controller_icons/objects/path_selection/InputActionSelector.gd
@@ -55,7 +55,7 @@ func populate(editor_interface: EditorInterface) -> void:
 	n_tree.clear()
 	## Using clear() triggers a signal and uses freed nodes.
 	## Setting the text directly does not.
-	n_name_filter.text = "" 
+	n_name_filter.text = ""
 	items.clear()
 
 	n_name_filter.right_icon = editor_interface.get_base_control().get_theme_icon("Search", "EditorIcons")
@@ -70,7 +70,7 @@ func populate(editor_interface: EditorInterface) -> void:
 	ControllerIcons._parse_input_actions()
 
 	# List with all default input actions
-	var default_actions := ControllerIcons._builtin_keys.map(
+	var default_actions: Variant = ControllerIcons._builtin_keys.map(
 		func(value: String):
 			return value.trim_prefix("input/")
 	)
diff --git a/game/addons/controller_icons/objects/path_selection/JoypadPathSelector.gd b/game/addons/controller_icons/objects/path_selection/JoypadPathSelector.gd
index bec7bfb..12ac4de 100644
--- a/game/addons/controller_icons/objects/path_selection/JoypadPathSelector.gd
+++ b/game/addons/controller_icons/objects/path_selection/JoypadPathSelector.gd
@@ -39,7 +39,7 @@ func grab_focus(hide_focus: bool = false) -> void:
 
 func _input(event):
 	if not visible: return
-	
+
 	if event is InputEventJoypadMotion:
 		_input_motion(event)
 	elif event is InputEventJoypadButton:
diff --git a/game/addons/controller_icons/objects/path_selection/SpecificPathSelector.gd b/game/addons/controller_icons/objects/path_selection/SpecificPathSelector.gd
index b5f860d..3eadb59 100644
--- a/game/addons/controller_icons/objects/path_selection/SpecificPathSelector.gd
+++ b/game/addons/controller_icons/objects/path_selection/SpecificPathSelector.gd
@@ -41,17 +41,17 @@ class ControllerIcons_Icon:
 	var button : Button
 	var category : String
 	var path : String
-	
+
 	var selected: bool:
 		set(_selected):
 			selected = _selected
 			_query_visibility()
-	
+
 	var filtered: bool:
 		set(_filtered):
 			filtered = _filtered
 			_query_visibility()
-	
+
 	func _query_visibility():
 		if is_instance_valid(button):
 			button.visible = selected and filtered
@@ -95,7 +95,7 @@ func populate(editor_interface: EditorInterface) -> void:
 		# Directories next
 		for dir in DirAccess.get_directories_at(base_path):
 			handle_files(dir, base_path.path_join(dir))
-	
+
 	var child : TreeItem = asset_names_root.get_next_in_tree()
 	if child:
 		child.select(0)
@@ -179,11 +179,11 @@ func _on_name_filter_text_changed(new_text:String):
 			var filtered : bool = true if new_text.is_empty() else icon.path.findn(new_text) != -1
 			icon.filtered = filtered
 			any_visible[key] = any_visible[key] or filtered
-	
+
 	asset_name = asset_names_root.get_next_in_tree()
 	while asset_name:
 		var category := asset_name.get_text(0)
-		if any_visible.has(category): 
+		if any_visible.has(category):
 			var selectable : bool = any_visible[category]
 			asset_name.set_selectable(0, selectable)
 			if not selectable:
diff --git a/game/addons/controller_icons/objects/path_selection/input_action.tscn b/game/addons/controller_icons/objects/path_selection/input_action.tscn
index f3b97e9..2c5b15e 100644
--- a/game/addons/controller_icons/objects/path_selection/input_action.tscn
+++ b/game/addons/controller_icons/objects/path_selection/input_action.tscn
@@ -1,8 +1,8 @@
-[gd_scene load_steps=2 format=3 uid="uid://bituity863qe4"]
+[gd_scene format=3 uid="uid://bituity863qe4"]
 
-[ext_resource type="Script" path="res://addons/controller_icons/objects/path_selection/InputActionSelector.gd" id="1_shxks"]
+[ext_resource type="Script" uid="uid://cux0b4qbbgt1k" path="res://addons/controller_icons/objects/path_selection/InputActionSelector.gd" id="1_shxks"]
 
-[node name="Input Action" type="Panel"]
+[node name="Input Action" type="Panel" unique_id=2129633926]
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -10,7 +10,7 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_shxks")
 
-[node name="VBoxContainer" type="VBoxContainer" parent="."]
+[node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=607708657]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -18,31 +18,31 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="Label" type="Label" parent="VBoxContainer"]
+[node name="Label" type="Label" parent="VBoxContainer" unique_id=1346052317]
 layout_mode = 2
 text = "The icon will be tied to an input action, swapping between keyboard/mouse and controller automatically."
 horizontal_alignment = 1
 
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer" unique_id=639428426]
 layout_mode = 2
 
-[node name="NameFilter" type="LineEdit" parent="VBoxContainer/HBoxContainer"]
+[node name="NameFilter" type="LineEdit" parent="VBoxContainer/HBoxContainer" unique_id=1869311974]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 placeholder_text = "Filter by name..."
 clear_button_enabled = true
 
-[node name="BuiltinActionButton" type="CheckButton" parent="VBoxContainer/HBoxContainer"]
+[node name="BuiltinActionButton" type="CheckButton" parent="VBoxContainer/HBoxContainer" unique_id=419605612]
 unique_name_in_owner = true
 layout_mode = 2
 text = "Show Built-in Actions"
 
-[node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer"]
+[node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer" unique_id=869296746]
 layout_mode = 2
 size_flags_vertical = 3
 
-[node name="Tree" type="Tree" parent="VBoxContainer/ScrollContainer"]
+[node name="Tree" type="Tree" parent="VBoxContainer/ScrollContainer" unique_id=1958908345]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
diff --git a/game/addons/controller_icons/objects/path_selection/joypad_path.tscn b/game/addons/controller_icons/objects/path_selection/joypad_path.tscn
index f20b9f7..44b7b48 100644
--- a/game/addons/controller_icons/objects/path_selection/joypad_path.tscn
+++ b/game/addons/controller_icons/objects/path_selection/joypad_path.tscn
@@ -1,7 +1,7 @@
-[gd_scene load_steps=25 format=3 uid="uid://b3lplrf2w6kh7"]
+[gd_scene format=3 uid="uid://b3lplrf2w6kh7"]
 
-[ext_resource type="Script" path="res://addons/controller_icons/objects/path_selection/JoypadPathSelector.gd" id="1_4ryog"]
-[ext_resource type="Script" path="res://addons/controller_icons/objects/ControllerIconTexture.gd" id="2_yxfq6"]
+[ext_resource type="Script" uid="uid://bmaqusfxa6q85" path="res://addons/controller_icons/objects/path_selection/JoypadPathSelector.gd" id="1_4ryog"]
+[ext_resource type="Script" uid="uid://ch00l1e1rteyw" path="res://addons/controller_icons/objects/ControllerIconTexture.gd" id="2_yxfq6"]
 
 [sub_resource type="ButtonGroup" id="ButtonGroup_haylq"]
 
@@ -9,192 +9,129 @@
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/l_stick"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_6klsb"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/l_stick_click"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_bij8j"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/r_stick"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_2h0w3"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/r_stick_click"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_kvj2q"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/lb"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_wtcrq"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/lt"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_lfpf5"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/rb"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_b3bsp"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/rt"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_u40go"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/a"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_rnqww"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/b"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_1a2yv"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/x"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_hktfi"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/y"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_2ksy6"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/select"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_08sqi"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/start"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_tivgf"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/home"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_87fow"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/share"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_n4i6p"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/dpad"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_eoyuo"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/dpad_down"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_c660e"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/dpad_right"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_riwus"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/dpad_left"
-show_only = 0
-force_type = 0
 
 [sub_resource type="Texture2D" id="Texture2D_onmvf"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("2_yxfq6")
-_horizontal_repeat = 1
 path = "joypad/dpad_up"
-show_only = 0
-force_type = 0
 
-[node name="Joypad Path" type="Panel"]
+[node name="Joypad Path" type="Panel" unique_id=765320828]
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -202,7 +139,7 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_4ryog")
 
-[node name="VBoxContainer" type="VBoxContainer" parent="."]
+[node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=1749594538]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -210,16 +147,16 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="Label" type="Label" parent="VBoxContainer"]
+[node name="Label" type="Label" parent="VBoxContainer" unique_id=1718477869]
 layout_mode = 2
 text = "The icon will only display a controller icon, changing dynamically according to the connected controller brand."
 horizontal_alignment = 1
 
-[node name="Control" type="Control" parent="VBoxContainer"]
+[node name="Control" type="Control" parent="VBoxContainer" unique_id=923245007]
 layout_mode = 2
 size_flags_vertical = 3
 
-[node name="ButtonLabel" type="Label" parent="VBoxContainer/Control"]
+[node name="ButtonLabel" type="Label" parent="VBoxContainer/Control" unique_id=247820962]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(350, 0)
 layout_mode = 1
@@ -235,7 +172,7 @@ text = "Press or click on the desired button..."
 horizontal_alignment = 1
 autowrap_mode = 3
 
-[node name="LStick" type="Button" parent="VBoxContainer/Control"]
+[node name="LStick" type="Button" parent="VBoxContainer/Control" unique_id=509548715]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -254,7 +191,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_nls54")
 expand_icon = true
 
-[node name="LStickClick" type="Button" parent="VBoxContainer/Control"]
+[node name="LStickClick" type="Button" parent="VBoxContainer/Control" unique_id=261308393]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -273,7 +210,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_6klsb")
 expand_icon = true
 
-[node name="RStick" type="Button" parent="VBoxContainer/Control"]
+[node name="RStick" type="Button" parent="VBoxContainer/Control" unique_id=1498434362]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -292,7 +229,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_bij8j")
 expand_icon = true
 
-[node name="RStickClick" type="Button" parent="VBoxContainer/Control"]
+[node name="RStickClick" type="Button" parent="VBoxContainer/Control" unique_id=516800206]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -311,7 +248,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_2h0w3")
 expand_icon = true
 
-[node name="LB" type="Button" parent="VBoxContainer/Control"]
+[node name="LB" type="Button" parent="VBoxContainer/Control" unique_id=1466164738]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -330,7 +267,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_kvj2q")
 expand_icon = true
 
-[node name="LT" type="Button" parent="VBoxContainer/Control"]
+[node name="LT" type="Button" parent="VBoxContainer/Control" unique_id=1124827853]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -349,7 +286,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_wtcrq")
 expand_icon = true
 
-[node name="RB" type="Button" parent="VBoxContainer/Control"]
+[node name="RB" type="Button" parent="VBoxContainer/Control" unique_id=1445384318]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -368,7 +305,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_lfpf5")
 expand_icon = true
 
-[node name="RT" type="Button" parent="VBoxContainer/Control"]
+[node name="RT" type="Button" parent="VBoxContainer/Control" unique_id=6469349]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -387,7 +324,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_b3bsp")
 expand_icon = true
 
-[node name="A" type="Button" parent="VBoxContainer/Control"]
+[node name="A" type="Button" parent="VBoxContainer/Control" unique_id=997906940]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -406,7 +343,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_u40go")
 expand_icon = true
 
-[node name="B" type="Button" parent="VBoxContainer/Control"]
+[node name="B" type="Button" parent="VBoxContainer/Control" unique_id=1603204347]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -425,7 +362,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_rnqww")
 expand_icon = true
 
-[node name="X" type="Button" parent="VBoxContainer/Control"]
+[node name="X" type="Button" parent="VBoxContainer/Control" unique_id=1508949322]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -444,7 +381,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_1a2yv")
 expand_icon = true
 
-[node name="Y" type="Button" parent="VBoxContainer/Control"]
+[node name="Y" type="Button" parent="VBoxContainer/Control" unique_id=2014875402]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -463,7 +400,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_hktfi")
 expand_icon = true
 
-[node name="Select" type="Button" parent="VBoxContainer/Control"]
+[node name="Select" type="Button" parent="VBoxContainer/Control" unique_id=1682288831]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -482,7 +419,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_2ksy6")
 expand_icon = true
 
-[node name="Start" type="Button" parent="VBoxContainer/Control"]
+[node name="Start" type="Button" parent="VBoxContainer/Control" unique_id=613705021]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -501,7 +438,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_08sqi")
 expand_icon = true
 
-[node name="Home" type="Button" parent="VBoxContainer/Control"]
+[node name="Home" type="Button" parent="VBoxContainer/Control" unique_id=294856160]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -520,7 +457,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_tivgf")
 expand_icon = true
 
-[node name="Share" type="Button" parent="VBoxContainer/Control"]
+[node name="Share" type="Button" parent="VBoxContainer/Control" unique_id=566866623]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -539,7 +476,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_87fow")
 expand_icon = true
 
-[node name="DPAD" type="Button" parent="VBoxContainer/Control"]
+[node name="DPAD" type="Button" parent="VBoxContainer/Control" unique_id=50424830]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -558,7 +495,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_n4i6p")
 expand_icon = true
 
-[node name="DPADDown" type="Button" parent="VBoxContainer/Control"]
+[node name="DPADDown" type="Button" parent="VBoxContainer/Control" unique_id=70716784]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -577,7 +514,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_eoyuo")
 expand_icon = true
 
-[node name="DPADRight" type="Button" parent="VBoxContainer/Control"]
+[node name="DPADRight" type="Button" parent="VBoxContainer/Control" unique_id=1636780892]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -596,7 +533,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_c660e")
 expand_icon = true
 
-[node name="DPADLeft" type="Button" parent="VBoxContainer/Control"]
+[node name="DPADLeft" type="Button" parent="VBoxContainer/Control" unique_id=1805410265]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -615,7 +552,7 @@ button_group = SubResource("ButtonGroup_haylq")
 icon = SubResource("Texture2D_riwus")
 expand_icon = true
 
-[node name="DPADUp" type="Button" parent="VBoxContainer/Control"]
+[node name="DPADUp" type="Button" parent="VBoxContainer/Control" unique_id=332093229]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 8
@@ -638,12 +575,12 @@ expand_icon = true
 [connection signal="pressed" from="VBoxContainer/Control/LStick" to="." method="_on_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/LStickClick" to="." method="_on_l_stick_click_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/LStickClick" to="." method="_on_button_pressed"]
-[connection signal="pressed" from="VBoxContainer/Control/RStick" to="." method="_on_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/RStick" to="." method="_on_r_stick_pressed"]
-[connection signal="pressed" from="VBoxContainer/Control/RStickClick" to="." method="_on_button_pressed"]
+[connection signal="pressed" from="VBoxContainer/Control/RStick" to="." method="_on_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/RStickClick" to="." method="_on_r_stick_click_pressed"]
-[connection signal="pressed" from="VBoxContainer/Control/LB" to="." method="_on_button_pressed"]
+[connection signal="pressed" from="VBoxContainer/Control/RStickClick" to="." method="_on_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/LB" to="." method="_on_lb_pressed"]
+[connection signal="pressed" from="VBoxContainer/Control/LB" to="." method="_on_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/LT" to="." method="_on_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/LT" to="." method="_on_lt_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/RB" to="." method="_on_button_pressed"]
@@ -652,12 +589,12 @@ expand_icon = true
 [connection signal="pressed" from="VBoxContainer/Control/RT" to="." method="_on_rt_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/A" to="." method="_on_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/A" to="." method="_on_a_pressed"]
-[connection signal="pressed" from="VBoxContainer/Control/B" to="." method="_on_b_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/B" to="." method="_on_button_pressed"]
+[connection signal="pressed" from="VBoxContainer/Control/B" to="." method="_on_b_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/X" to="." method="_on_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/X" to="." method="_on_x_pressed"]
-[connection signal="pressed" from="VBoxContainer/Control/Y" to="." method="_on_y_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/Y" to="." method="_on_button_pressed"]
+[connection signal="pressed" from="VBoxContainer/Control/Y" to="." method="_on_y_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/Select" to="." method="_on_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/Select" to="." method="_on_select_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/Start" to="." method="_on_button_pressed"]
@@ -666,8 +603,8 @@ expand_icon = true
 [connection signal="pressed" from="VBoxContainer/Control/Home" to="." method="_on_home_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/Share" to="." method="_on_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/Share" to="." method="_on_share_pressed"]
-[connection signal="pressed" from="VBoxContainer/Control/DPAD" to="." method="_on_dpad_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/DPAD" to="." method="_on_button_pressed"]
+[connection signal="pressed" from="VBoxContainer/Control/DPAD" to="." method="_on_dpad_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/DPADDown" to="." method="_on_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/DPADDown" to="." method="_on_dpad_down_pressed"]
 [connection signal="pressed" from="VBoxContainer/Control/DPADRight" to="." method="_on_button_pressed"]
diff --git a/game/addons/controller_icons/objects/path_selection/specific_path.tscn b/game/addons/controller_icons/objects/path_selection/specific_path.tscn
index 32eb43c..72c57d7 100644
--- a/game/addons/controller_icons/objects/path_selection/specific_path.tscn
+++ b/game/addons/controller_icons/objects/path_selection/specific_path.tscn
@@ -1,8 +1,8 @@
-[gd_scene load_steps=2 format=3 uid="uid://d2ow6e2ba86b6"]
+[gd_scene format=3 uid="uid://d2ow6e2ba86b6"]
 
-[ext_resource type="Script" path="res://addons/controller_icons/objects/path_selection/SpecificPathSelector.gd" id="1_iqwfd"]
+[ext_resource type="Script" uid="uid://byr7oqfrmvvrr" path="res://addons/controller_icons/objects/path_selection/SpecificPathSelector.gd" id="1_iqwfd"]
 
-[node name="Specific Path" type="Panel"]
+[node name="Specific Path" type="Panel" unique_id=1160258465]
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -10,7 +10,7 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_iqwfd")
 
-[node name="VBoxContainer" type="VBoxContainer" parent="."]
+[node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=1437304502]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -18,31 +18,31 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="Label" type="Label" parent="VBoxContainer"]
+[node name="Label" type="Label" parent="VBoxContainer" unique_id=1162334022]
 layout_mode = 2
 text = "The icon will be set to a specific asset, without any dynamic remapping."
 horizontal_alignment = 1
 
-[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer" unique_id=1050160720]
 layout_mode = 2
 
-[node name="NameFilter" type="LineEdit" parent="VBoxContainer/HBoxContainer"]
+[node name="NameFilter" type="LineEdit" parent="VBoxContainer/HBoxContainer" unique_id=1859599372]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 placeholder_text = "Filter by name..."
 clear_button_enabled = true
 
-[node name="HSplitContainer" type="HSplitContainer" parent="VBoxContainer"]
+[node name="HSplitContainer" type="HSplitContainer" parent="VBoxContainer" unique_id=1391841572]
 layout_mode = 2
 size_flags_vertical = 3
 
-[node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer/HSplitContainer"]
+[node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer/HSplitContainer" unique_id=1924056680]
 custom_minimum_size = Vector2(200, 0)
 layout_mode = 2
 size_flags_horizontal = 0
 
-[node name="BaseAssetNames" type="Tree" parent="VBoxContainer/HSplitContainer/ScrollContainer"]
+[node name="BaseAssetNames" type="Tree" parent="VBoxContainer/HSplitContainer/ScrollContainer" unique_id=1641664959]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
@@ -50,14 +50,14 @@ size_flags_vertical = 3
 hide_folding = true
 hide_root = true
 
-[node name="ScrollContainer2" type="ScrollContainer" parent="VBoxContainer/HSplitContainer"]
+[node name="ScrollContainer2" type="ScrollContainer" parent="VBoxContainer/HSplitContainer" unique_id=834702801]
 custom_minimum_size = Vector2(200, 0)
 layout_mode = 2
 size_flags_horizontal = 3
 follow_focus = true
 horizontal_scroll_mode = 0
 
-[node name="AssetsContainer" type="HFlowContainer" parent="VBoxContainer/HSplitContainer/ScrollContainer2"]
+[node name="AssetsContainer" type="HFlowContainer" parent="VBoxContainer/HSplitContainer/ScrollContainer2" unique_id=1445983063]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
diff --git a/game/addons/controller_icons/settings.tres b/game/addons/controller_icons/settings.tres
index 804193e..f12ff55 100644
--- a/game/addons/controller_icons/settings.tres
+++ b/game/addons/controller_icons/settings.tres
@@ -1,12 +1,6 @@
-[gd_resource type="Resource" script_class="ControllerSettings" load_steps=2 format=3 uid="uid://dolsrvh5w47et"]
+[gd_resource type="Resource" script_class="ControllerSettings" format=3 uid="uid://dolsrvh5w47et"]
 
-[ext_resource type="Script" path="res://addons/controller_icons/ControllerSettings.gd" id="1"]
+[ext_resource type="Script" uid="uid://decjbfcobhp82" path="res://addons/controller_icons/ControllerSettings.gd" id="1"]
 
 [resource]
 script = ExtResource("1")
-joypad_fallback = 9
-joypad_deadzone = 0.5
-allow_mouse_remap = true
-mouse_min_movement = 200
-custom_asset_dir = ""
-custom_file_extension = ""
diff --git a/game/assets/dev/dark/dark_01.tres b/game/assets/dev/dark/dark_01.tres
index b2ad3ef..c6ff779 100644
--- a/game/assets/dev/dark/dark_01.tres
+++ b/game/assets/dev/dark/dark_01.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" format=3 uid="uid://c38215ysnknyk"]
 
-[ext_resource type="Texture2D" uid="uid://d4m1r5bjq4lbe" path="res://assets/materials/dev/dark/texture_01.png" id="1_38xbi"]
+[ext_resource type="Texture2D" uid="uid://d4m1r5bjq4lbe" path="res://assets/dev/dark/texture_01.png" id="1_38xbi"]
 
 [resource]
 albedo_texture = ExtResource("1_38xbi")
diff --git a/game/assets/dev/dark/dark_02.tres b/game/assets/dev/dark/dark_02.tres
index 7a3c380..fcd54d9 100644
--- a/game/assets/dev/dark/dark_02.tres
+++ b/game/assets/dev/dark/dark_02.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" format=3 uid="uid://olxux7okrb2b"]
 
-[ext_resource type="Texture2D" uid="uid://c8a1v7bw3jjca" path="res://assets/materials/dev/dark/texture_02.png" id="1_jl162"]
+[ext_resource type="Texture2D" uid="uid://c8a1v7bw3jjca" path="res://assets/dev/dark/texture_02.png" id="1_jl162"]
 
 [resource]
 albedo_texture = ExtResource("1_jl162")
diff --git a/game/assets/dev/dark/dark_03.tres b/game/assets/dev/dark/dark_03.tres
index b977b53..01aa448 100644
--- a/game/assets/dev/dark/dark_03.tres
+++ b/game/assets/dev/dark/dark_03.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" format=3 uid="uid://blkew2hja11cj"]
 
-[ext_resource type="Texture2D" uid="uid://crgcp76xdixb" path="res://assets/materials/dev/dark/texture_03.png" id="1_t7bo5"]
+[ext_resource type="Texture2D" uid="uid://crgcp76xdixb" path="res://assets/dev/dark/texture_03.png" id="1_t7bo5"]
 
 [resource]
 albedo_texture = ExtResource("1_t7bo5")
diff --git a/game/assets/dev/dark/dark_04.tres b/game/assets/dev/dark/dark_04.tres
index 6463b39..59c5594 100644
--- a/game/assets/dev/dark/dark_04.tres
+++ b/game/assets/dev/dark/dark_04.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" format=3 uid="uid://biu40ot7f55no"]
 
-[ext_resource type="Texture2D" uid="uid://djftxgnhedhk2" path="res://assets/materials/dev/dark/texture_05.png" id="1_l8w0p"]
+[ext_resource type="Texture2D" uid="uid://djftxgnhedhk2" path="res://assets/dev/dark/texture_05.png" id="1_l8w0p"]
 
 [resource]
 albedo_texture = ExtResource("1_l8w0p")
diff --git a/game/assets/dev/dark/dark_05.tres b/game/assets/dev/dark/dark_05.tres
index c7b341a..9b24ccb 100644
--- a/game/assets/dev/dark/dark_05.tres
+++ b/game/assets/dev/dark/dark_05.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" format=3 uid="uid://dto0mke6wp060"]
 
-[ext_resource type="Texture2D" uid="uid://d4m1r5bjq4lbe" path="res://assets/materials/dev/dark/texture_01.png" id="1_c2346"]
+[ext_resource type="Texture2D" uid="uid://d4m1r5bjq4lbe" path="res://assets/dev/dark/texture_01.png" id="1_c2346"]
 
 [resource]
 albedo_texture = ExtResource("1_c2346")
diff --git a/game/assets/dev/orange/orange_01.tres b/game/assets/dev/orange/orange_01.tres
index 87d09f0..8657eec 100644
--- a/game/assets/dev/orange/orange_01.tres
+++ b/game/assets/dev/orange/orange_01.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" format=3 uid="uid://bahys2ntbh2ap"]
 
-[ext_resource type="Texture2D" uid="uid://g26nr5u8081t" path="res://assets/materials/dev/orange/texture_01.png" id="1_vb3n0"]
+[ext_resource type="Texture2D" uid="uid://g26nr5u8081t" path="res://assets/dev/orange/texture_01.png" id="1_vb3n0"]
 
 [resource]
 albedo_texture = ExtResource("1_vb3n0")
diff --git a/game/assets/dev/orange/orange_02.tres b/game/assets/dev/orange/orange_02.tres
index 8187bda..abef3e4 100644
--- a/game/assets/dev/orange/orange_02.tres
+++ b/game/assets/dev/orange/orange_02.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" format=3 uid="uid://r527wj0qbkvs"]
 
-[ext_resource type="Texture2D" uid="uid://12e0onm52r6b" path="res://assets/materials/dev/orange/texture_02.png" id="1_4qkig"]
+[ext_resource type="Texture2D" uid="uid://12e0onm52r6b" path="res://assets/dev/orange/texture_02.png" id="1_4qkig"]
 
 [resource]
 albedo_texture = ExtResource("1_4qkig")
diff --git a/game/assets/dev/orange/orange_03.tres b/game/assets/dev/orange/orange_03.tres
index 51d09be..f0923dd 100644
--- a/game/assets/dev/orange/orange_03.tres
+++ b/game/assets/dev/orange/orange_03.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" format=3 uid="uid://diwfj3ywaniq5"]
 
-[ext_resource type="Texture2D" uid="uid://eemth84vpstv" path="res://assets/materials/dev/orange/texture_03.png" id="1_fipy7"]
+[ext_resource type="Texture2D" uid="uid://eemth84vpstv" path="res://assets/dev/orange/texture_03.png" id="1_fipy7"]
 
 [resource]
 albedo_texture = ExtResource("1_fipy7")
diff --git a/game/assets/dev/orange/orange_04.tres b/game/assets/dev/orange/orange_04.tres
index 3693b77..fc6cd97 100644
--- a/game/assets/dev/orange/orange_04.tres
+++ b/game/assets/dev/orange/orange_04.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" format=3 uid="uid://bwbwqb84pmji3"]
 
-[ext_resource type="Texture2D" uid="uid://bgj70nov05sqo" path="res://assets/materials/dev/orange/texture_04.png" id="1_mje5s"]
+[ext_resource type="Texture2D" uid="uid://bgj70nov05sqo" path="res://assets/dev/orange/texture_04.png" id="1_mje5s"]
 
 [resource]
 albedo_texture = ExtResource("1_mje5s")
diff --git a/game/assets/dev/orange/orange_05.tres b/game/assets/dev/orange/orange_05.tres
index 2e60a85..af13cef 100644
--- a/game/assets/dev/orange/orange_05.tres
+++ b/game/assets/dev/orange/orange_05.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" format=3 uid="uid://d02jll28bgkap"]
 
-[ext_resource type="Texture2D" uid="uid://5erjqyy4c7xn" path="res://assets/materials/dev/orange/texture_05.png" id="1_phgo0"]
+[ext_resource type="Texture2D" uid="uid://5erjqyy4c7xn" path="res://assets/dev/orange/texture_05.png" id="1_phgo0"]
 
 [resource]
 albedo_texture = ExtResource("1_phgo0")
diff --git a/game/localization/localization.de.translation b/game/localization/localization.de.translation
index cd577d0..70a90b2 100644
Binary files a/game/localization/localization.de.translation and b/game/localization/localization.de.translation differ
diff --git a/game/localization/localization.en.translation b/game/localization/localization.en.translation
index d95cc46..0471e77 100644
Binary files a/game/localization/localization.en.translation and b/game/localization/localization.en.translation differ
diff --git a/game/localization/localization.es.translation b/game/localization/localization.es.translation
index 21e6988..a45bc77 100644
Binary files a/game/localization/localization.es.translation and b/game/localization/localization.es.translation differ
diff --git a/game/localization/localization.ja.translation b/game/localization/localization.ja.translation
index 761a676..4cdffa3 100644
Binary files a/game/localization/localization.ja.translation and b/game/localization/localization.ja.translation differ
diff --git a/game/project.godot b/game/project.godot
index 7e94109..339c917 100644
--- a/game/project.godot
+++ b/game/project.godot
@@ -18,10 +18,10 @@ config/icon="res://godot_icon.svg"
 
 [autoload]
 
-ControllerIcons="*uid://ddcwjvcc65eg0"
 SPrint="*uid://cpfunq8fyixco"
 VersionDisplay="*uid://bqxtpo2c64h22"
 InputManager="*uid://cocp0vmvgd4ln"
+ControllerIcons="*uid://bdosbfkp568je"
 
 [debug]
 
@@ -176,4 +176,3 @@ locale/translations=PackedStringArray("res://localization/localization.en.transl
 rendering_device/driver.windows="d3d12"
 anti_aliasing/quality/msaa_3d=3
 occlusion_culling/use_occlusion_culling=true
-environment/defaults/default_environment="uid://dimoldnkk6fig"
diff --git a/game/src/gameplay/systems/flashlight/flashlight_battery.tscn b/game/src/gameplay/systems/flashlight/flashlight_battery.tscn
index 640f3c7..53d3918 100644
--- a/game/src/gameplay/systems/flashlight/flashlight_battery.tscn
+++ b/game/src/gameplay/systems/flashlight/flashlight_battery.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" uid="uid://nsxr1qkvivsf" path="res://src/gameplay/systems/flashlight/flashlight_battery.gd" id="1_p5331"]
 [ext_resource type="Script" uid="uid://ckdo7huqoleoi" path="res://src/core/interaction/interaction_types/pickup.gd" id="2_0r1sb"]
-[ext_resource type="Script" uid="uid://c2w177bb5r70x" path="res://addons/controller_icons/objects/ControllerIconTexture.gd" id="3_3nps0"]
+[ext_resource type="Script" uid="uid://ch00l1e1rteyw" path="res://addons/controller_icons/objects/ControllerIconTexture.gd" id="3_3nps0"]
 [ext_resource type="PackedScene" uid="uid://2dre1e56emw6" path="res://src/core/interaction/interaction_area.tscn" id="3_ouj7b"]
 
 [sub_resource type="CylinderMesh" id="CylinderMesh_0r1sb"]
diff --git a/game/src/gameplay/systems/power_box/fuse_pickup.tscn b/game/src/gameplay/systems/power_box/fuse_pickup.tscn
index f84f2d0..d47b7ad 100644
--- a/game/src/gameplay/systems/power_box/fuse_pickup.tscn
+++ b/game/src/gameplay/systems/power_box/fuse_pickup.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" uid="uid://dkao86mwhq1tm" path="res://src/gameplay/systems/power_box/fuse_pickup.gd" id="1_b733i"]
 [ext_resource type="Script" uid="uid://ckdo7huqoleoi" path="res://src/core/interaction/interaction_types/pickup.gd" id="2_of2nm"]
-[ext_resource type="Script" uid="uid://c2w177bb5r70x" path="res://addons/controller_icons/objects/ControllerIconTexture.gd" id="3_hqmg0"]
+[ext_resource type="Script" uid="uid://ch00l1e1rteyw" path="res://addons/controller_icons/objects/ControllerIconTexture.gd" id="3_hqmg0"]
 [ext_resource type="PackedScene" uid="uid://2dre1e56emw6" path="res://src/core/interaction/interaction_area.tscn" id="4_3b6jw"]
 
 [sub_resource type="Texture2D" id="Texture2D_3b6jw"]
diff --git a/game/src/gameplay/systems/power_box/power_box_fuse.tscn b/game/src/gameplay/systems/power_box/power_box_fuse.tscn
index 2963257..b2d1661 100644
--- a/game/src/gameplay/systems/power_box/power_box_fuse.tscn
+++ b/game/src/gameplay/systems/power_box/power_box_fuse.tscn
@@ -2,15 +2,15 @@
 
 [ext_resource type="Script" uid="uid://bpvawt7ate0ug" path="res://src/gameplay/systems/power_box/power_box.gd" id="1_m14vv"]
 [ext_resource type="Script" uid="uid://ckdo7huqoleoi" path="res://src/core/interaction/interaction_types/pickup.gd" id="2_35cpc"]
-[ext_resource type="Script" uid="uid://c2w177bb5r70x" path="res://addons/controller_icons/objects/ControllerIconTexture.gd" id="3_35cpc"]
+[ext_resource type="Script" uid="uid://ch00l1e1rteyw" path="res://addons/controller_icons/objects/ControllerIconTexture.gd" id="3_35cpc"]
 [ext_resource type="PackedScene" uid="uid://2dre1e56emw6" path="res://src/core/interaction/interaction_area.tscn" id="4_v6qxf"]
 
-[sub_resource type="Texture2D" id="Texture2D_v6qxf"]
+[sub_resource type="Texture2D" id="Texture2D_35cpc"]
 resource_local_to_scene = false
 resource_name = ""
 script = ExtResource("3_35cpc")
 path = "interact"
-metadata/_custom_type_script = "uid://c2w177bb5r70x"
+metadata/_custom_type_script = "uid://ch00l1e1rteyw"
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_v6qxf"]
 size = Vector3(0.5, 0.8, 0.5)
@@ -25,7 +25,7 @@ metadata/_custom_type_script = "uid://bpvawt7ate0ug"
 
 [node name="PickupInteraction" type="Node" parent="." unique_id=1698155134]
 script = ExtResource("2_35cpc")
-button_prompt = SubResource("Texture2D_v6qxf")
+button_prompt = SubResource("Texture2D_35cpc")
 metadata/_custom_type_script = "uid://ckdo7huqoleoi"
 
 [node name="InteractionArea" parent="." unique_id=1987460629 node_paths=PackedStringArray("interaction_types") instance=ExtResource("4_v6qxf")]
diff --git a/game/src/worlds/exposition/exposition.tscn b/game/src/worlds/exposition/exposition.tscn
index 31f0989..d84cc3e 100644
--- a/game/src/worlds/exposition/exposition.tscn
+++ b/game/src/worlds/exposition/exposition.tscn
@@ -599,13 +599,13 @@ material = ExtResource("4_8xmty")
 [node name="godot_plush V2" parent="." index="7" unique_id=1756431274 instance=ExtResource("8_qm8ha")]
 transform = Transform3D(-50, 0, 4.371139e-06, 0, 50, 0, -4.371139e-06, 0, -50, 0, 5.628097, 0)
 
-[node name="godot_plush_01" parent="godot_plush V2" index="0" unique_id=1349065114]
+[node name="godot_plush_01" parent="godot_plush V2" index="0" unique_id=1748171278]
 visible = false
 
-[node name="godot_plush_sitted" parent="godot_plush V2" index="1" unique_id=1735494843]
+[node name="godot_plush_sitted" parent="godot_plush V2" index="1" unique_id=438565683]
 visible = false
 
-[node name="godot_plush_02" parent="godot_plush V2" index="2" unique_id=460556493]
+[node name="godot_plush_02" parent="godot_plush V2" index="2" unique_id=1913873414]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0025618896, 0)
 
 [node name="Objects" type="Node3D" parent="." index="8" unique_id=249052389]