11 files changed, 105 insertions, 76 deletions
diff --git a/Scenes/Game/Game.tscn b/Scenes/Game/Game.tscn
index f571b52..4d62d3a 100644
--- a/Scenes/Game/Game.tscn
+++ b/Scenes/Game/Game.tscn
@@ -13,38 +13,38 @@ script = ExtResource( 4 )
 [node name="Screen" parent="." instance=ExtResource( 1 )]
 
 [node name="TopBar" parent="Screen/ScreenContainer" index="0"]
-margin_right = 800.0
-margin_bottom = 27.0
+offset_right = 800.0
+offset_bottom = 27.0
 
 [node name="StatusArea" parent="Screen/ScreenContainer/TopBar" index="0" instance=ExtResource( 5 )]
 unique_name_in_owner = true
-margin_left = 8.0
-margin_right = 792.0
+offset_left = 8.0
+offset_right = 792.0
 Title = "Adventure Title"
 
 [node name="Content" parent="Screen/ScreenContainer" index="1"]
-margin_top = 27.0
-margin_right = 800.0
-margin_bottom = 575.0
+offset_top = 27.0
+offset_right = 800.0
+offset_bottom = 575.0
 
 [node name="OutputArea" parent="Screen/ScreenContainer/Content" index="0" instance=ExtResource( 2 )]
 unique_name_in_owner = true
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 8.0
-margin_right = 792.0
-margin_bottom = 548.0
+offset_left = 8.0
+offset_right = 792.0
+offset_bottom = 548.0
 OutputBlockScene = ExtResource( 6 )
 
 [node name="BottomBar" parent="Screen/ScreenContainer" index="2"]
-margin_top = 575.0
-margin_right = 800.0
-margin_bottom = 600.0
+offset_top = 575.0
+offset_right = 800.0
+offset_bottom = 600.0
 
 [node name="InputArea" parent="Screen/ScreenContainer/BottomBar" index="0" instance=ExtResource( 3 )]
 unique_name_in_owner = true
-margin_left = 8.0
-margin_right = 792.0
+offset_left = 8.0
+offset_right = 792.0
 
 [connection signal="CommandSubmitted" from="Screen/ScreenContainer/BottomBar/InputArea" to="." method="OnCommandSubmitted"]
 [connection signal="UnknownInputSubmitted" from="Screen/ScreenContainer/BottomBar/InputArea" to="." method="OnUnknownInputSubmitted"]
diff --git a/Scenes/Menus/MainMenu.tscn b/Scenes/Menus/MainMenu.tscn
index f8e4661..d696e87 100644
--- a/Scenes/Menus/MainMenu.tscn
+++ b/Scenes/Menus/MainMenu.tscn
@@ -1,27 +1,56 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=4 format=3 uid="uid://bf4ll56nce4ps"]
 
-[ext_resource path="res://Scenes/Terminal/MenuScreen.tscn" type="PackedScene" id=1]
-[ext_resource path="res://Scenes/Menus/MainMenuButtons.tscn" type="PackedScene" id=2]
-[ext_resource path="res://Scripts/Menus/MainMenu.cs" type="Script" id=3]
+[ext_resource type="PackedScene" path="res://Scenes/Terminal/MenuScreen.tscn" id="1"]
+[ext_resource type="PackedScene" path="res://Scenes/Menus/MainMenuButtons.tscn" id="2"]
+[ext_resource type="Script" path="res://Scripts/Menus/MainMenu.cs" id="3"]
 
 [node name="MainMenu" type="Node"]
-script = ExtResource( 3 )
+script = ExtResource("3")
 
-[node name="MenuScreen" parent="." instance=ExtResource( 1 )]
+[node name="MenuScreen" parent="." instance=ExtResource("1")]
+layout_mode = 3
+anchors_preset = 15
+grow_horizontal = 2
+grow_vertical = 2
 Title = "TITLE_MAIN_MENU"
 
+[node name="ScreenContainer" parent="MenuScreen" index="0"]
+layout_mode = 1
+anchors_preset = 15
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="TopBar" parent="MenuScreen/ScreenContainer" index="0"]
+layout_mode = 2
+offset_right = 1152.0
+offset_bottom = 17.0
+theme_type_variation = &"InvertedPanelContainer"
+
 [node name="TitleArea" parent="MenuScreen/ScreenContainer/TopBar" index="0"]
+layout_mode = 2
+offset_right = 1144.0
+offset_bottom = 17.0
 Title = "[center]TITLE_MAIN_MENU[/center]"
 
-[node name="Buttons" parent="MenuScreen/ScreenContainer/Content" index="0" instance=ExtResource( 2 )]
+[node name="Content" parent="MenuScreen/ScreenContainer" index="1"]
+layout_mode = 2
+offset_top = 21.0
+offset_right = 1152.0
+offset_bottom = 644.0
+
+[node name="Buttons" parent="MenuScreen/ScreenContainer/Content" index="0" instance=ExtResource("2")]
+layout_mode = 2
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 8.0
-margin_right = 792.0
-margin_bottom = 573.0
+offset_left = 8.0
+offset_right = 1144.0
+offset_bottom = 623.0
 
-[connection signal="CreditsButtonPressed" from="MenuScreen/ScreenContainer/Content/Buttons" to="." method="OnCreditsButtonPressed"]
-[connection signal="QuitButtonPressed" from="MenuScreen/ScreenContainer/Content/Buttons" to="." method="OnQuitButtonPressed"]
-[connection signal="StartButtonPressed" from="MenuScreen/ScreenContainer/Content/Buttons" to="." method="OnStartButtonPressed"]
+[node name="BottomBar" parent="MenuScreen/ScreenContainer" index="2"]
+layout_mode = 2
+offset_top = 648.0
+offset_right = 1152.0
+offset_bottom = 648.0
+theme_type_variation = &"InvertedPanelContainer"
 
 [editable path="MenuScreen"]
diff --git a/Scenes/Menus/MainMenuButtons.tscn b/Scenes/Menus/MainMenuButtons.tscn
index 301c121..6b8a6dc 100644
--- a/Scenes/Menus/MainMenuButtons.tscn
+++ b/Scenes/Menus/MainMenuButtons.tscn
@@ -7,19 +7,19 @@
 script = ExtResource( 2 )
 
 [node name="StartButton" type="Button" parent="Buttons" index="0"]
-margin_top = 262.0
-margin_right = 400.0
-margin_bottom = 287.0
+offset_top = 262.0
+offset_right = 400.0
+offset_bottom = 287.0
 text = "BUTTON_START_GAME"
 
 [node name="CreditsButton" type="Button" parent="Buttons" index="1"]
-margin_top = 287.0
-margin_right = 400.0
-margin_bottom = 312.0
+offset_top = 287.0
+offset_right = 400.0
+offset_bottom = 312.0
 text = "BUTTON_CREDITS"
 
 [node name="QuitButton" type="Button" parent="Buttons" index="2"]
-margin_top = 312.0
-margin_right = 400.0
-margin_bottom = 337.0
+offset_top = 312.0
+offset_right = 400.0
+offset_bottom = 337.0
 text = "BUTTON_QUIT_GAME"
diff --git a/Scenes/MonitorEffect.tscn b/Scenes/MonitorEffect.tscn
index efc15b8..46b4f68 100644
--- a/Scenes/MonitorEffect.tscn
+++ b/Scenes/MonitorEffect.tscn
@@ -23,5 +23,5 @@ layer = 2
 material = SubResource( 1 )
 anchor_right = 1.0
 anchor_bottom = 1.0
-rect_clip_content = true
+clip_contents = true
 mouse_filter = 2
diff --git a/Scenes/Terminal/ButtonBlock.tscn b/Scenes/Terminal/ButtonBlock.tscn
index d8d535a..6982d3d 100644
--- a/Scenes/Terminal/ButtonBlock.tscn
+++ b/Scenes/Terminal/ButtonBlock.tscn
@@ -7,14 +7,14 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
-custom_constants/margin_right = 200
-custom_constants/margin_left = 200
+custom_constants/offset_right = 200
+custom_constants/offset_left = 200
 script = ExtResource( 1 )
 
 [node name="Buttons" type="VBoxContainer" parent="."]
 unique_name_in_owner = true
-margin_left = 200.0
-margin_right = 600.0
-margin_bottom = 600.0
+offset_left = 200.0
+offset_right = 600.0
+offset_bottom = 600.0
 custom_constants/separation = 0
 alignment = 1
diff --git a/Scenes/Terminal/InputArea.tscn b/Scenes/Terminal/InputArea.tscn
index 5532c6d..54c514e 100644
--- a/Scenes/Terminal/InputArea.tscn
+++ b/Scenes/Terminal/InputArea.tscn
@@ -3,25 +3,25 @@
 [ext_resource path="res://Scripts/Terminal/InputArea.cs" type="Script" id=1]
 
 [node name="InputArea" type="HBoxContainer"]
-margin_right = 640.0
-margin_bottom = 25.0
+offset_right = 640.0
+offset_bottom = 25.0
 script = ExtResource( 1 )
 
 [node name="PromptLabel" type="Label" parent="."]
 unique_name_in_owner = true
-margin_right = 20.0
-margin_bottom = 25.0
+offset_right = 20.0
+offset_bottom = 25.0
 theme_type_variation = "InvertedLabel"
 text = "?>"
 
 [node name="TextInput" type="LineEdit" parent="."]
 unique_name_in_owner = true
-margin_left = 28.0
-margin_right = 640.0
-margin_bottom = 25.0
+offset_left = 28.0
+offset_right = 640.0
+offset_bottom = 25.0
 size_flags_horizontal = 3
 context_menu_enabled = false
 selecting_enabled = false
 caret_blink = true
 
-[connection signal="text_entered" from="TextInput" to="." method="OnTextEntered"]
+[connection signal="text_submitted" from="TextInput" to="." method="OnTextEntered"]
diff --git a/Scenes/Terminal/MenuScreen.tscn b/Scenes/Terminal/MenuScreen.tscn
index 84e8a63..92387de 100644
--- a/Scenes/Terminal/MenuScreen.tscn
+++ b/Scenes/Terminal/MenuScreen.tscn
@@ -8,21 +8,21 @@
 script = ExtResource( 3 )
 
 [node name="TopBar" parent="ScreenContainer" index="0"]
-margin_right = 800.0
-margin_bottom = 27.0
+offset_right = 800.0
+offset_bottom = 27.0
 
 [node name="TitleArea" parent="ScreenContainer/TopBar" index="0" instance=ExtResource( 2 )]
 unique_name_in_owner = true
-margin_left = 8.0
-margin_right = 792.0
+offset_left = 8.0
+offset_right = 792.0
 Title = "[center][/center]"
 
 [node name="Content" parent="ScreenContainer" index="1"]
-margin_top = 27.0
-margin_right = 800.0
-margin_bottom = 600.0
+offset_top = 27.0
+offset_right = 800.0
+offset_bottom = 600.0
 
 [node name="BottomBar" parent="ScreenContainer" index="2"]
-margin_top = 600.0
-margin_right = 800.0
-margin_bottom = 600.0
+offset_top = 600.0
+offset_right = 800.0
+offset_bottom = 600.0
diff --git a/Scenes/Terminal/OutputArea.tscn b/Scenes/Terminal/OutputArea.tscn
index 779b0b7..4f41b9a 100644
--- a/Scenes/Terminal/OutputArea.tscn
+++ b/Scenes/Terminal/OutputArea.tscn
@@ -11,8 +11,8 @@ script = ExtResource( 1 )
 
 [node name="LineContainer" type="VBoxContainer" parent="."]
 unique_name_in_owner = true
-margin_right = 640.0
-margin_bottom = 480.0
+offset_right = 640.0
+offset_bottom = 480.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 custom_constants/separation = 0
diff --git a/Scenes/Terminal/OutputBlock.tscn b/Scenes/Terminal/OutputBlock.tscn
index 962aa0c..3613aed 100644
--- a/Scenes/Terminal/OutputBlock.tscn
+++ b/Scenes/Terminal/OutputBlock.tscn
@@ -9,8 +9,8 @@ script = ExtResource( 1 )
 
 [node name="ContentLabel" type="RichTextLabel" parent="."]
 unique_name_in_owner = true
-margin_right = 640.0
-margin_bottom = 27.0
+offset_right = 640.0
+offset_bottom = 27.0
 size_flags_horizontal = 3
 bbcode_enabled = true
 fit_content_height = true
diff --git a/Scenes/Terminal/Screen.tscn b/Scenes/Terminal/Screen.tscn
index b003db2..7b853b4 100644
--- a/Scenes/Terminal/Screen.tscn
+++ b/Scenes/Terminal/Screen.tscn
@@ -10,16 +10,16 @@ anchor_bottom = 1.0
 custom_constants/separation = 0
 
 [node name="TopBar" type="PanelContainer" parent="ScreenContainer"]
-margin_right = 640.0
+offset_right = 640.0
 theme_type_variation = "InvertedPanelContainer"
 
 [node name="Content" type="PanelContainer" parent="ScreenContainer"]
-margin_right = 640.0
-margin_bottom = 480.0
+offset_right = 640.0
+offset_bottom = 480.0
 size_flags_vertical = 3
 
 [node name="BottomBar" type="PanelContainer" parent="ScreenContainer"]
-margin_top = 480.0
-margin_right = 640.0
-margin_bottom = 480.0
+offset_top = 480.0
+offset_right = 640.0
+offset_bottom = 480.0
 theme_type_variation = "InvertedPanelContainer"
diff --git a/Scenes/Terminal/StatusArea.tscn b/Scenes/Terminal/StatusArea.tscn
index 21bcd94..1a9e4af 100644
--- a/Scenes/Terminal/StatusArea.tscn
+++ b/Scenes/Terminal/StatusArea.tscn
@@ -3,17 +3,17 @@
 [ext_resource path="res://Scripts/Terminal/StatusArea.cs" type="Script" id=1]
 
 [node name="StatusArea" type="HBoxContainer"]
-margin_right = 640.0
-margin_bottom = 27.0
+offset_right = 640.0
+offset_bottom = 27.0
 script = ExtResource( 1 )
 
 [node name="TitleLabel" type="RichTextLabel" parent="."]
 unique_name_in_owner = true
-margin_right = 640.0
-margin_bottom = 27.0
+offset_right = 640.0
+offset_bottom = 27.0
 size_flags_horizontal = 3
 theme_type_variation = "InvertedRichTextLabel"
 bbcode_enabled = true
-bbcode_text = "This is where the title goes"
+text = "This is where the title goes"
 text = "This is where the title goes"
 fit_content_height = true