diff --git a/src/base-environments/transition/misc/subway_map.tscn b/src/base-environments/transition/misc/subway_map.tscn
index 29a9068..30b9375 100644
--- a/src/base-environments/transition/misc/subway_map.tscn
+++ b/src/base-environments/transition/misc/subway_map.tscn
@@ -4,7 +4,7 @@
 [ext_resource type="FontFile" uid="uid://bdkb43smt08c0" path="res://import/fonts/Ubuntu-B.ttf" id="2_q6nhe"]
 
 [sub_resource type="GDScript" id="GDScript_80ahk"]
-script/source = "@tool
+script/source = "
 extends Node2D
 
 @export var current_station: Scenes.id = Scenes.id.ADULT_DND:
diff --git a/src/base-environments/transition/subway_train.tscn b/src/base-environments/transition/subway_train.tscn
index e025781..e774249 100644
--- a/src/base-environments/transition/subway_train.tscn
+++ b/src/base-environments/transition/subway_train.tscn
@@ -5,7 +5,7 @@
 [ext_resource type="Texture2D" uid="uid://bewykr0twbplg" path="res://base-environments/transition/import/textures/LateralTren_baseColor_upscayl_2x_realesrgan-x4plus-anime.png" id="5_6pwip"]
 
 [sub_resource type="GDScript" id="GDScript_6pwip"]
-script/source = "@tool
+script/source = "
 extends Node3D
 
 @export var door_open: bool:
diff --git a/src/base-environments/youth_room/fairylights.tscn b/src/base-environments/youth_room/fairylights.tscn
index 0d927fa..dc14dc3 100644
--- a/src/base-environments/youth_room/fairylights.tscn
+++ b/src/base-environments/youth_room/fairylights.tscn
@@ -6,7 +6,7 @@
 [ext_resource type="ArrayMesh" uid="uid://f5fr2e5gq313" path="res://base-environments/youth_room/shaders/fairy_light_diode.res" id="4_qh8yy"]
 
 [sub_resource type="GDScript" id="GDScript_2caij"]
-script/source = "@tool
+script/source = "
 extends Node3D
 
 @export var light_array: Array[Vector3]:
diff --git a/src/base-environments/youth_room/outside.tscn b/src/base-environments/youth_room/outside.tscn
index cc5d7c2..c8c744b 100644
--- a/src/base-environments/youth_room/outside.tscn
+++ b/src/base-environments/youth_room/outside.tscn
@@ -3,7 +3,7 @@
 [ext_resource type="PackedScene" uid="uid://c2uf5vwe2rdbd" path="res://base-environments/youth_room/import/cheeky-city.glb" id="1_yckvd"]
 
 [sub_resource type="GDScript" id="GDScript_bfd5g"]
-script/source = "@tool
+script/source = "
 extends Node3D
 
 @export var light_energy:float = 0:
diff --git a/src/base-environments/youth_room/scnees/scene_player.gd b/src/base-environments/youth_room/scnees/scene_player.gd
index a261930..b28321e 100644
--- a/src/base-environments/youth_room/scnees/scene_player.gd
+++ b/src/base-environments/youth_room/scnees/scene_player.gd
@@ -1,4 +1,3 @@
-@tool
 extends CenterContainer
 
 signal text_finished
diff --git a/src/base-environments/youth_room/youth_room_visuals.tscn b/src/base-environments/youth_room/youth_room_visuals.tscn
index 74e3adf..b4b9e82 100644
--- a/src/base-environments/youth_room/youth_room_visuals.tscn
+++ b/src/base-environments/youth_room/youth_room_visuals.tscn
@@ -4,12 +4,12 @@
 [ext_resource type="Texture2D" uid="uid://dp1bv446sk2xf" path="res://addons/kenney_particle_pack/flare_01.png" id="2_ipdak"]
 
 [sub_resource type="GDScript" id="GDScript_w4p0y"]
-script/source = "@tool
+script/source = "
 extends Node3D
 
 var has_stage
 
-@export_tool_button(\"Play Chest Animation\") var play_action = play_chest_animation
+#@export_tool_button(\"Play Chest Animation\") var play_action = play_chest_animation
 
 func _ready() -> void:
 	if not Engine.is_editor_hint():
diff --git a/src/button_themer.gd b/src/button_themer.gd
index ae981cb..28663b8 100644
--- a/src/button_themer.gd
+++ b/src/button_themer.gd
@@ -1,20 +1,19 @@
-@tool
 class_name ThemedButton extends Button
 
-@export_tool_button("Rebuild") var rebuild_action = rebuild
-@onready var side_decor: CompressedTexture2D = load("res://import/interface-elements/button_active.png")
-@onready var top_corner_decor: CompressedTexture2D = load("res://import/interface-elements/top_corner.png")
-@onready var lower_corner_decor: CompressedTexture2D = load("res://import/interface-elements/lower_corner.png")
+#@export_tool_button("Rebuild") var rebuild_action := rebuild
+@onready var side_decor := load("res://import/interface-elements/button_active.png")
+@onready var top_corner_decor := load("res://import/interface-elements/top_corner.png")
+@onready var lower_corner_decor := load("res://import/interface-elements/lower_corner.png")
 
 func _ready() -> void:
 	rebuild()
 	theme_changed.connect(rebuild)
 	resized.connect(rebuild)
 	clip_contents = true
-	
-	
-	
-	
+
+
+
+
 
 var container: PanelContainer
 func rebuild():
@@ -38,7 +37,7 @@ func rebuild():
 			lower_corner.size = Vector2(size.y * lower_corner_decor.get_width() / lower_corner_decor.get_height(), size.y)
 			lower_corner.set_anchors_preset(Control.PRESET_BOTTOM_RIGHT, true)
 			lower_corner.position = size-lower_corner.size
-			
+
 		_:
 			var side_thing:= TextureRect.new()
 			side_thing.texture = side_decor
diff --git a/src/dev-util/candle-prototype.tscn b/src/dev-util/candle-prototype.tscn
index dba48d3..6d9074a 100644
--- a/src/dev-util/candle-prototype.tscn
+++ b/src/dev-util/candle-prototype.tscn
@@ -18,7 +18,7 @@ fill_from = Vector2(0.499433, 0.470085)
 fill_to = Vector2(0.23814, 0.858974)
 
 [sub_resource type="GDScript" id="GDScript_2ph0d"]
-script/source = "@tool
+script/source = "
 extends Sprite2D
 
 var flame_progression: float = 0
diff --git a/src/dev-util/i18n_texture_rect.gd b/src/dev-util/i18n_texture_rect.gd
index 2b4b9ea..12770eb 100644
--- a/src/dev-util/i18n_texture_rect.gd
+++ b/src/dev-util/i18n_texture_rect.gd
@@ -1,4 +1,3 @@
-@tool
 extends TextureRect
 
 @export var textures: Dictionary[String, Texture] = {}
@@ -13,7 +12,7 @@ func _get_configuration_warnings() -> PackedStringArray:
 func _ready() -> void:
 	State.settings_changed.connect(update_img)
 	update_img()
-	
+
 func update_img() -> void:
 	if textures.keys().has(TranslationServer.get_locale()):
 		texture = textures[TranslationServer.get_locale()]
diff --git a/src/dev-util/savegame.gd b/src/dev-util/savegame.gd
index 81c2cdb..a94ac2b 100644
--- a/src/dev-util/savegame.gd
+++ b/src/dev-util/savegame.gd
@@ -1,4 +1,3 @@
-@tool
 class_name SaveGame extends Resource
 
 var _is_initialised: bool = false
diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd
index d2eccdd..e84a736 100644
--- a/src/logic-scenes/board/card.gd
+++ b/src/logic-scenes/board/card.gd
@@ -1,4 +1,3 @@
-@tool
 extends Area2D
 class_name Card
 
diff --git a/src/logic-scenes/board/empty_sticky_note_panel.gd b/src/logic-scenes/board/empty_sticky_note_panel.gd
index 03573d5..dde68fc 100644
--- a/src/logic-scenes/board/empty_sticky_note_panel.gd
+++ b/src/logic-scenes/board/empty_sticky_note_panel.gd
@@ -1,4 +1,3 @@
-@tool
 class_name StickyNotePanel
 extends Panel
 
diff --git a/src/logic-scenes/board/sticky-note.gd b/src/logic-scenes/board/sticky-note.gd
index 3252c92..eabaa68 100644
--- a/src/logic-scenes/board/sticky-note.gd
+++ b/src/logic-scenes/board/sticky-note.gd
@@ -1,5 +1,3 @@
-@tool
-
 extends Area2D
 class_name StickyNote
 
diff --git a/src/logic-scenes/chat_view/chat-bubble.gd b/src/logic-scenes/chat_view/chat-bubble.gd
index ae57a8f..f8f29d6 100644
--- a/src/logic-scenes/chat_view/chat-bubble.gd
+++ b/src/logic-scenes/chat_view/chat-bubble.gd
@@ -1,4 +1,3 @@
-@tool
 class_name ChatMessage extends Resource
 
 @export_multiline var text: String = ""
diff --git a/src/logic-scenes/chat_view/chat-view.gd b/src/logic-scenes/chat_view/chat-view.gd
index 8cef447..b8f673d 100644
--- a/src/logic-scenes/chat_view/chat-view.gd
+++ b/src/logic-scenes/chat_view/chat-view.gd
@@ -1,4 +1,3 @@
-@tool
 class_name ChatView extends ScrollContainer
 
 @export var messages: Array[ChatMessage]
diff --git a/src/logic-scenes/collectable/collectable_ui.gd b/src/logic-scenes/collectable/collectable_ui.gd
index b0811c8..1c0840d 100644
--- a/src/logic-scenes/collectable/collectable_ui.gd
+++ b/src/logic-scenes/collectable/collectable_ui.gd
@@ -1,8 +1,7 @@
-@tool
 extends CenterContainer
 class_name Collectable_Ui
 
-@export var scene:Scenes.id = 0
+@export var scene:Scenes.id = 0 as Scenes.id
 
 @export var collapsed = true:
 	set(collapse):
@@ -18,9 +17,9 @@ class_name Collectable_Ui
 			if is_inside_tree():
 				_show_buttons()
 			collapsed = collapse
-			
+
 		if collapse and has_stage: State.leave_stage(self)
-			
+
 @export var is_board: bool = false:
 	set(board):
 		is_board = board
@@ -31,9 +30,9 @@ class_name Collectable_Ui
 @export var has_stage: bool = false:
 	set(focused):
 		print("set focus of card to ", focused)
-		
-		if has_stage == focused: return    
-		
+
+		if has_stage == focused: return
+
 		if focused:
 			has_stage = true
 			collapsed = false
@@ -42,7 +41,7 @@ class_name Collectable_Ui
 		elif has_stage:
 			has_stage = false
 			get_viewport().gui_release_focus()
-		
+
 # FIXME needs to be outsourced to scene reference state
 @export var collected: bool = false:
 	set(set_collected):
@@ -57,9 +56,9 @@ class_name Collectable_Ui
 			else:
 				$Panel/Content/Buttons/VBoxContainer/collect_or_listen.disabled = true
 			$Panel/Content/Buttons/VBoxContainer/put_back.show()
-		else: 
+		else:
 			$Panel/Content/Buttons/VBoxContainer/collect_or_listen.disabled = false
-			
+
 @export var skipped: bool = false
 
 @export var item_name: String = "":
@@ -84,7 +83,7 @@ func _ready():
 	#$Panel/Content/Buttons/VBoxContainer/Summary.visible = State.provide_summaries
 	#$Panel/Content/Buttons/VBoxContainer/skip.visible = State.allow_skipping
 	if visible and not collapsed: _show_buttons()
-	
+
 	content_notes = content_notes
 	is_board = is_board
 	item_name = item_name
@@ -93,7 +92,7 @@ func _hide_buttons():
 	if is_inside_tree():
 		if not State.reduce_motion:
 			$AnimationPlayer.play_backwards("show_buttons")
-	
+
 func _show_buttons():
 	if is_inside_tree():
 		if not State.reduce_motion:
@@ -102,7 +101,7 @@ func _show_buttons():
 			$AnimationPlayer.play("RESET")
 	else:
 		$AnimationPlayer.play("RESET")
-	
+
 func vanish():
 	if visible:
 		var tween = create_tween()
@@ -126,7 +125,7 @@ func reveal():
 func _yoink_focus():
 	if not has_stage:
 		State.transition_stage_to(self)
-		
+
 func _on_pick_button_pressed():
 	print("card collected!")
 	if not is_board:
@@ -146,5 +145,5 @@ func _on_skip_pressed():
 		emit_signal("scene_skipped", 1)
 		skipped = true
 		$Panel/Content/Buttons/VBoxContainer/collect_or_listen.text = "collect (un-skip)"
-	
+
 	State.leave_stage(self)
diff --git a/src/logic-scenes/collectable/collectable_ui.tscn b/src/logic-scenes/collectable/collectable_ui.tscn
index 17b473c..29e0b6c 100644
--- a/src/logic-scenes/collectable/collectable_ui.tscn
+++ b/src/logic-scenes/collectable/collectable_ui.tscn
@@ -5,7 +5,7 @@
 [ext_resource type="Texture2D" uid="uid://d0ucjqi8tx6vt" path="res://import/interface-elements/frame.png" id="3_63j61"]
 
 [sub_resource type="GDScript" id="GDScript_g0qhf"]
-script/source = "@tool
+script/source = "
 extends Button
 
 func hide():
diff --git a/src/logic-scenes/collectable/new_collectable_ui.gd b/src/logic-scenes/collectable/new_collectable_ui.gd
index d280c41..23123f3 100644
--- a/src/logic-scenes/collectable/new_collectable_ui.gd
+++ b/src/logic-scenes/collectable/new_collectable_ui.gd
@@ -1,10 +1,9 @@
-@tool
 class_name CollectableUi extends CenterContainer
 
 @export var has_stage: bool = false:
 	set(focused):
-		if has_stage == focused: return    
-		
+		if has_stage == focused: return
+
 		if focused:
 			has_stage = true
 			is_collapsed = false
@@ -28,7 +27,7 @@ class_name CollectableUi extends CenterContainer
 #			if is_inside_tree():
 #				_show_buttons()
 #			collapsed = collapse
-#			
+#
 #		if collapse and has_stage: State.leave_stage(self)
 
 @export var scene: Scenes.id = Scenes.id.YOUTH_DRAEVEN:
@@ -73,7 +72,7 @@ class_name CollectableUi extends CenterContainer
 				Scenes.id.ADULT_BURNOUT:
 					if title_override == "": title_label.text = TranslationServer.translate("Paperwork")
 					if subtitle_override == "": cn_label.text = ""
-					
+
 		if not Engine.is_editor_hint():
 			is_collected = Scenes.is_sequence_repeating(scene)
 @export var is_collected: bool = false:
@@ -161,7 +160,7 @@ func _ready() -> void:
 	State.settings_changed.connect(_on_context_updated)
 	%CollectButton.pressed.connect(collect_memento)
 	##TODO: add functions for remaining buttons
-	
+
 	update_state()
 
 func _on_context_updated():
@@ -189,7 +188,7 @@ func try_reveal() -> bool:
 		animation_player.play("reveal")
 		return true
 	return false
-	
+
 #func _process(_delta: float) -> void:
 #	if not visible or Engine.is_editor_hint(): return
 #	if Input.is_action_just_pressed("collect_memento_ui"):
@@ -218,7 +217,7 @@ func _input(event: InputEvent) -> void:
 
 func vanish():
 	if not visible: return
-	
+
 	if is_expanded:
 		animation_player.play("vanish_all")
 	else:
@@ -238,5 +237,5 @@ func _on_skip_pressed():
 		scene_skipped.emit(1)
 		was_skipped = true
 		$Panel/Content/Buttons/VBoxContainer/collect_or_listen.text = "collect (un-skip)"
-	
+
 	State.leave_stage(self)
diff --git a/src/logic-scenes/main menu/save_game_display.gd b/src/logic-scenes/main menu/save_game_display.gd
index cae9d86..656c934 100644
--- a/src/logic-scenes/main menu/save_game_display.gd	
+++ b/src/logic-scenes/main menu/save_game_display.gd	
@@ -1,4 +1,3 @@
-@tool
 class_name SaveGameDisplay extends Button
 
 var _is_built: bool = false
diff --git a/src/logic-scenes/main menu/save_game_list.gd b/src/logic-scenes/main menu/save_game_list.gd
index 6b31758..abce82f 100644
--- a/src/logic-scenes/main menu/save_game_list.gd	
+++ b/src/logic-scenes/main menu/save_game_list.gd	
@@ -1,4 +1,3 @@
-@tool
 class_name SaveGameHandle extends CenterContainer
 
 signal picked(save_game: SaveGame)
@@ -72,8 +71,9 @@ func _on_game_picked(id: int):
 		if saves[id].current_room == 0:
 			picked.emit(id)
 		else:
-			$Popup.show()
-
+			pass
+			#picked.emit(id)
+			#$Popup.show() #FIXME: This popup is missing
 	else:
 		picked.emit(id)
 
diff --git a/src/logic-scenes/main menu/video_settings.tscn b/src/logic-scenes/main menu/video_settings.tscn
index 86be4eb..bd3a3fe 100644
--- a/src/logic-scenes/main menu/video_settings.tscn	
+++ b/src/logic-scenes/main menu/video_settings.tscn	
@@ -3,7 +3,7 @@
 [ext_resource type="Script" uid="uid://16y8yg750rxm" path="res://logic-scenes/main menu/video_settings.gd" id="1_sii8g"]
 
 [sub_resource type="GDScript" id="GDScript_24hb5"]
-script/source = "@tool
+script/source = "
 extends SpinBox
 
 func reset():
diff --git a/src/main.gd b/src/main.gd
index 2a623ff..d3e89e3 100644
--- a/src/main.gd
+++ b/src/main.gd
@@ -34,7 +34,7 @@ var currently_loading_room: String = "":
 		else:
 			menu_animation["parameters/conditions/loading_done"] = true
 			menu_animation["parameters/conditions/load_save"] = false
-		
+
 		currently_loading_room = path
 
 # Called when the node enters the scene tree for the first time.
@@ -45,7 +45,7 @@ func _ready():
 	await get_tree().process_frame
 	currently_loading_room = get_room_path_from_id(main_menu.save_game_handle.get_most_recent_save().current_room)
 	State.pass_stage_to(main_menu)
-	
+
 	Scenes.scene_starting.connect(prepare_transition)
 	Scenes.scene_finished.connect(transition)
 
@@ -62,7 +62,7 @@ func _process(_delta: float) -> void:
 			move_child(current_room, 0)
 			currently_loading_room = ""
 			room_loaded.emit()
-			
+
 	if Input.is_action_just_pressed("reset_demo") and (OS.has_feature("demo") or true):
 		State.stage_list = [self]
 		_return_to_menu()
@@ -95,11 +95,11 @@ func debug_youth():
 
 func _return_to_menu():
 	State.active_save_game = null
-	
+
 	menu_animation["parameters/conditions/start_game"] = false
-	
+
 	State.pass_stage_to(main_menu)
-	
+
 	currently_loading_room = get_room_path_from_id(main_menu.save_game_handle.get_most_recent_save().current_room)
 
 	menu_animation["parameters/conditions/return_to_menu"] = true
@@ -108,17 +108,17 @@ func _return_to_menu():
 	_on_ready_to_unload()
 
 func load_save(save: SaveGame):
-	
+
 	if currently_loading_room != "":
 		await(room_loaded)
-	
+
 	if save.current_room != current_room.id:
 		# TODO Prevent race condition from appearing when save is loaded while room is still loading.
 		currently_loading_room = get_room_path_from_id(save.current_room)
 		await(room_loaded)
-	
+
 	menu_animation["parameters/conditions/start_game"] = true
-	
+
 	State.active_save_game = save
 	in_game = true
 	current_room.start_room()
@@ -126,7 +126,7 @@ func load_save(save: SaveGame):
 func _on_ready_to_unload():
 	if get_child(0) is Node3D:
 		get_child(0).free()
-	
+
 func get_room_path_from_id(id: State.rooms) -> String:
 	match id:
 		State.rooms.YOUTH, State.rooms.NULL:
@@ -169,7 +169,7 @@ func prepare_transition(scene_id: Scenes.id, _repeat):
 		if not _repeat:
 			currently_loading_room = get_room_path_from_id(State.rooms.TRANSITION)
 		else:
-			
+
 			currently_loading_room = get_room_path_from_id(State.rooms.ADULTHOOD)
 
 func transition(scene_id: Scenes.id, _repeat):
@@ -182,4 +182,3 @@ func transition(scene_id: Scenes.id, _repeat):
 			Scenes.end_current_sequence()
 		else:
 			State.pass_stage_to(current_room)
-		
diff --git a/src/main_menu.tscn b/src/main_menu.tscn
index 346cd3a..0e265a1 100644
--- a/src/main_menu.tscn
+++ b/src/main_menu.tscn
@@ -446,6 +446,8 @@ grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
 script = ExtResource("8_o0cpj")
+saves = null
+update_display = null
 metadata/_custom_type_script = "uid://dugfwcvp7i01k"
 
 [node name="CenterContainer" type="CenterContainer" parent="."]
diff --git a/src/setting.gd b/src/setting.gd
index 2511882..566a93b 100644
--- a/src/setting.gd
+++ b/src/setting.gd
@@ -1,4 +1,3 @@
-@tool
 class_name MenuSetting extends Resource
 
 enum Receivers {
diff --git a/src/singletons/global_state.gd b/src/singletons/global_state.gd
index d00db06..2322a7a 100644
--- a/src/singletons/global_state.gd
+++ b/src/singletons/global_state.gd
@@ -1,4 +1,3 @@
-@tool
 extends Node
 
 #region configuration