Move to Godot 4 and fixes

10 files changed, 473 insertions, 550 deletions

diff --git a/scenes/audio.tscn b/scenes/audio.tscn
index 1ac82eb..0c43644 100644
--- a/scenes/audio.tscn
+++ b/scenes/audio.tscn
@@ -1,11 +1,11 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=2 format=3 uid="uid://ckf344kaw3ak6"]
 
-[ext_resource path="res://sound/unused_music.ogg" type="AudioStream" id=1]
+[ext_resource type="AudioStream" uid="uid://cx0oukrbd2e4e" path="res://sound/unused_music.ogg" id="1"]
 
 [node name="Audio" type="Node"]
-pause_mode = 2
+process_mode = 3
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
-stream = ExtResource( 1 )
+stream = ExtResource("1")
 volume_db = -20.0
-bus = "Music"
+bus = &"Music"
diff --git a/scenes/basketball.tscn b/scenes/basketball.tscn
index f6b01b3..70f9ac8 100644
--- a/scenes/basketball.tscn
+++ b/scenes/basketball.tscn
@@ -1,43 +1,40 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=6 format=3 uid="uid://dnb0otlc0mnc5"]
 
-[ext_resource path="res://textures/basketball.png" type="Texture" id=1]
-[ext_resource path="res://scripts/basketball.gd" type="Script" id=2]
-[ext_resource path="res://textures/release_indicator.png" type="Texture" id=3]
+[ext_resource type="Script" path="res://scripts/basketball.gd" id="2"]
+[ext_resource type="Texture2D" uid="uid://cxj2d4xkponp3" path="res://textures/basketball.png" id="2_naarc"]
+[ext_resource type="Texture2D" uid="uid://bvt8l7s2qeplp" path="res://textures/release_indicator.png" id="3_ihdpi"]
 
-[sub_resource type="PhysicsMaterial" id=2]
+[sub_resource type="PhysicsMaterial" id="2"]
 bounce = 0.65
 
-[sub_resource type="CircleShape2D" id=1]
+[sub_resource type="CircleShape2D" id="1"]
 radius = 8.0
 
 [node name="Basketball" type="RigidBody2D"]
-physics_material_override = SubResource( 2 )
-script = ExtResource( 2 )
-__meta__ = {
-"_edit_group_": true
-}
+physics_material_override = SubResource("2")
+script = ExtResource("2")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-shape = SubResource( 1 )
+shape = SubResource("1")
 
-[node name="GhostSprite" type="Sprite" parent="."]
+[node name="GhostSprite" type="Sprite2D" parent="."]
 visible = false
-modulate = Color( 1, 1, 1, 0.494118 )
-texture = ExtResource( 1 )
+modulate = Color(1, 1, 1, 0.494118)
+texture = ExtResource("2_naarc")
 
-[node name="Sprite" type="Sprite" parent="."]
-texture = ExtResource( 1 )
+[node name="Sprite2D" type="Sprite2D" parent="."]
+texture = ExtResource("2_naarc")
 
 [node name="InnerShape" type="Area2D" parent="."]
 
 [node name="CollisionShape2D2" type="CollisionShape2D" parent="InnerShape"]
-shape = SubResource( 1 )
+shape = SubResource("1")
 
-[node name="ReleaseIndicator" type="Sprite" parent="."]
+[node name="ReleaseIndicator" type="Sprite2D" parent="."]
 visible = false
-modulate = Color( 1, 1, 1, 0.498039 )
-texture = ExtResource( 3 )
-offset = Vector2( 0, -2 )
+modulate = Color(1, 1, 1, 0.498039)
+texture = ExtResource("3_ihdpi")
+offset = Vector2(0, -2)
 
 [connection signal="mouse_entered" from="InnerShape" to="." method="_on_InnerShape_mouse_entered"]
 [connection signal="mouse_exited" from="InnerShape" to="." method="_on_InnerShape_mouse_exited"]
diff --git a/scenes/hoop.tscn b/scenes/hoop.tscn
index 5463a18..7183d85 100644
--- a/scenes/hoop.tscn
+++ b/scenes/hoop.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://textures/hoop_fore.png" type="Texture" id=1]
-[ext_resource path="res://textures/hoop_back.png" type="Texture" id=2]
+[ext_resource path="res://textures/hoop_fore.png" type="Texture2D" id=1]
+[ext_resource path="res://textures/hoop_back.png" type="Texture2D" id=2]
 [ext_resource path="res://scripts/hoop.gd" type="Script" id=3]
 
 [sub_resource type="SegmentShape2D" id=1]
@@ -9,17 +9,17 @@ a = Vector2( 5.8, -12.4 )
 b = Vector2( -4.6, 11.4 )
 
 [sub_resource type="RectangleShape2D" id=2]
-extents = Vector2( 6.3, 0.55 )
+size = Vector2( 6.3, 0.55 )
 
 [node name="Hoop" type="StaticBody2D"]
 script = ExtResource( 3 )
 
-[node name="BackgroundSprite" type="Sprite" parent="."]
+[node name="BackgroundSprite" type="Sprite2D" parent="."]
 light_mask = 4
 z_index = -1
 texture = ExtResource( 2 )
 
-[node name="ForegroundSprite" type="Sprite" parent="."]
+[node name="ForegroundSprite" type="Sprite2D" parent="."]
 position = Vector2( -12, 16 )
 z_index = 1
 texture = ExtResource( 1 )
@@ -32,7 +32,7 @@ shape = SubResource( 1 )
 position = Vector2( -21.8, 6.6 )
 rotation = 0.546288
 scale = Vector2( 0.5, 1 )
-polygon = PoolVector2Array( 0.762794, -5.14728, 5.32917, 3.9975, 2.25312, 4.93263, -3.35769, 0.318554 )
+polygon = PackedVector2Array( 0.762794, -5.14728, 5.32917, 3.9975, 2.25312, 4.93263, -3.35769, 0.318554 )
 
 [node name="Area2D" type="Area2D" parent="."]
 
@@ -43,7 +43,7 @@ shape = SubResource( 2 )
 [node name="CollisionPolygon2D2" type="CollisionPolygon2D" parent="."]
 position = Vector2( -12.5, 14.4 )
 rotation = 3.14159
-polygon = PoolVector2Array( 10.9, 3.20002, -11.1, 3.19997, -8.49998, -3.60003, 7.50002, -3.59999 )
+polygon = PackedVector2Array( 10.9, 3.20002, -11.1, 3.19997, -8.49998, -3.60003, 7.50002, -3.59999 )
 one_way_collision = true
 
 [connection signal="body_exited" from="Area2D" to="." method="_on_Area2D_body_exited"]
diff --git a/scenes/interface.tscn b/scenes/interface.tscn
index 23aeb44..ed21f96 100644
--- a/scenes/interface.tscn
+++ b/scenes/interface.tscn
@@ -1,219 +1,225 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=8 format=3 uid="uid://cixqgc85i5wnn"]
 
-[ext_resource path="res://scenes/pausemenu.tscn" type="PackedScene" id=1]
-[ext_resource path="res://textures/hourglass.png" type="Texture" id=2]
-[ext_resource path="res://scripts/interface.gd" type="Script" id=3]
-[ext_resource path="res://theme_data/interface_theme.tres" type="Theme" id=4]
+[ext_resource type="PackedScene" uid="uid://dgeurb05rmq88" path="res://scenes/pausemenu.tscn" id="1"]
+[ext_resource type="Texture2D" uid="uid://c5w410bewcnh5" path="res://textures/hourglass.png" id="2"]
+[ext_resource type="Script" path="res://scripts/interface.gd" id="3"]
+[ext_resource type="Theme" uid="uid://2jc1rrh032m0" path="res://theme_data/interface_theme.tres" id="4"]
 
-[sub_resource type="Animation" id=1]
+[sub_resource type="Animation" id="1"]
 length = 0.001
 tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
 tracks/0/path = NodePath(".:visible")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
-tracks/0/imported = false
-tracks/0/enabled = true
 tracks/0/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
 "update": 0,
-"values": [ false ]
+"values": [false]
 }
 tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
 tracks/1/path = NodePath("../ChangeLabel:visible")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
-tracks/1/imported = false
-tracks/1/enabled = true
 tracks/1/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
 "update": 0,
-"values": [ false ]
+"values": [false]
 }
 tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
 tracks/2/path = NodePath("../ChangeLabel:modulate")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
-tracks/2/imported = false
-tracks/2/enabled = true
 tracks/2/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
 "update": 0,
-"values": [ Color( 1, 1, 1, 1 ) ]
+"values": [Color(1, 1, 1, 1)]
 }
 tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
 tracks/3/path = NodePath(".:modulate")
 tracks/3/interp = 1
 tracks/3/loop_wrap = true
-tracks/3/imported = false
-tracks/3/enabled = true
 tracks/3/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
 "update": 0,
-"values": [ Color( 1, 1, 1, 1 ) ]
+"values": [Color(1, 1, 1, 1)]
 }
 
-[sub_resource type="Animation" id=2]
+[sub_resource type="Animation" id="2"]
 resource_name = "blinking"
 length = 4.0
 tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
 tracks/0/path = NodePath(".:visible")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
-tracks/0/imported = false
-tracks/0/enabled = true
 tracks/0/keys = {
-"times": PoolRealArray( 0, 3 ),
-"transitions": PoolRealArray( 1, 1 ),
+"times": PackedFloat32Array(0, 3),
+"transitions": PackedFloat32Array(1, 1),
 "update": 1,
-"values": [ true, false ]
+"values": [true, false]
 }
 tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
 tracks/1/path = NodePath("../ChangeLabel:visible")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
-tracks/1/imported = false
-tracks/1/enabled = true
 tracks/1/keys = {
-"times": PoolRealArray( 0, 3 ),
-"transitions": PoolRealArray( 1, 1 ),
+"times": PackedFloat32Array(0, 3),
+"transitions": PackedFloat32Array(1, 1),
 "update": 1,
-"values": [ true, false ]
+"values": [true, false]
 }
 tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
 tracks/2/path = NodePath("../ChangeLabel:modulate")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
-tracks/2/imported = false
-tracks/2/enabled = true
 tracks/2/keys = {
-"times": PoolRealArray( 0, 0.5, 1, 1.5, 2, 2.5, 3 ),
-"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1 ),
+"times": PackedFloat32Array(0, 0.5, 1, 1.5, 2, 2.5, 3),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1),
 "update": 0,
-"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
+"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1), Color(1, 1, 1, 1), Color(1, 1, 1, 0), Color(1, 1, 1, 1), Color(1, 1, 1, 1), Color(1, 1, 1, 0)]
 }
 tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
 tracks/3/path = NodePath(".:modulate")
 tracks/3/interp = 1
 tracks/3/loop_wrap = true
-tracks/3/imported = false
-tracks/3/enabled = true
 tracks/3/keys = {
-"times": PoolRealArray( 0, 0.5, 2.5, 3 ),
-"transitions": PoolRealArray( 1, 1, 1, 1 ),
+"times": PackedFloat32Array(0, 0.5, 2.5, 3),
+"transitions": PackedFloat32Array(1, 1, 1, 1),
 "update": 0,
-"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
+"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1), Color(1, 1, 1, 1), Color(1, 1, 1, 0)]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_fobnn"]
+_data = {
+"RESET": SubResource("1"),
+"blinking": SubResource("2")
 }
 
 [node name="Interface" type="CanvasLayer"]
-script = ExtResource( 3 )
+script = ExtResource("3")
 
 [node name="TimerLabel" type="Label" parent="."]
+anchors_preset = 3
 anchor_left = 1.0
 anchor_top = 1.0
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_left = -22.0
-margin_top = -15.0
-margin_right = 2.00002
-margin_bottom = 1.00001
-rect_scale = Vector2( 0.8, 0.8 )
-theme = ExtResource( 4 )
+offset_left = -22.0
+offset_top = -15.0
+offset_right = 2.00002
+offset_bottom = 1.00001
+scale = Vector2(0.8, 0.8)
+theme = ExtResource("4")
 text = "000"
-align = 2
-__meta__ = {
-"_edit_use_anchors_": true
-}
 
-[node name="Sprite" type="Sprite" parent="TimerLabel"]
-position = Vector2( -4.99998, 8.75 )
-texture = ExtResource( 2 )
+[node name="Sprite2D" type="Sprite2D" parent="TimerLabel"]
+position = Vector2(-4.99998, 8.75)
+texture = ExtResource("2")
 
 [node name="ScoreLabel" type="Label" parent="."]
-margin_top = -2.0
-margin_right = 48.0
-margin_bottom = 14.0
-rect_scale = Vector2( 0.8, 0.8 )
-theme = ExtResource( 4 )
+offset_top = -2.0
+offset_right = 48.0
+offset_bottom = 14.0
+scale = Vector2(0.8, 0.8)
+theme = ExtResource("4")
 text = "Score:"
 
 [node name="Timer" type="Timer" parent="."]
 
 [node name="LoseLabel" type="Label" parent="."]
 visible = false
+anchors_preset = 8
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -107.0
-margin_top = -20.0
-margin_right = 107.0
-margin_bottom = 20.0
-theme = ExtResource( 4 )
+offset_left = -107.0
+offset_top = -20.0
+offset_right = 107.0
+offset_bottom = 20.0
+theme = ExtResource("4")
 text = "YOU RAN OUT OF TIME!
 RESTART?"
-align = 1
+horizontal_alignment = 1
 
 [node name="Difficulty" type="Control" parent="."]
+layout_mode = 3
+anchors_preset = 8
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -20.0
-margin_top = -20.0
-margin_right = 20.0
-margin_bottom = 20.0
+offset_left = -20.0
+offset_top = -20.0
+offset_right = 20.0
+offset_bottom = 20.0
+grow_horizontal = 2
+grow_vertical = 2
 mouse_filter = 2
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="Difficulty"]
 root_node = NodePath("../MessageLabel")
-anims/RESET = SubResource( 1 )
-anims/blinking = SubResource( 2 )
+libraries = {
+"": SubResource("AnimationLibrary_fobnn")
+}
 
 [node name="MessageLabel" type="Label" parent="Difficulty"]
 visible = false
+layout_mode = 0
 anchor_left = 0.5
 anchor_right = 0.5
-margin_left = -107.0
-margin_right = 107.0
-margin_bottom = 16.0
-theme = ExtResource( 4 )
+offset_left = -107.0
+offset_right = 107.0
+offset_bottom = 16.0
+theme = ExtResource("4")
 text = "DIFFICULT PHASE CHANGED:"
-align = 1
+horizontal_alignment = 1
 
 [node name="ChangeLabel" type="Label" parent="Difficulty"]
 visible = false
+layout_mode = 0
 anchor_left = 0.5
 anchor_top = 1.0
 anchor_right = 0.5
 anchor_bottom = 1.0
-margin_left = -107.0
-margin_top = -28.0
-margin_right = 107.0
-margin_bottom = -12.0
-custom_colors/font_color_shadow = Color( 0.788235, 0.0823529, 0.0823529, 1 )
+offset_left = -107.0
+offset_top = -28.0
+offset_right = 107.0
+offset_bottom = -12.0
 text = "TEST"
-align = 1
+horizontal_alignment = 1
 
 [node name="PhaseLabel" type="Label" parent="."]
+anchors_preset = 2
 anchor_top = 1.0
 anchor_bottom = 1.0
-margin_top = -8.0
-margin_right = 88.0
-margin_bottom = 8.0
-rect_scale = Vector2( 0.5, 0.5 )
-theme = ExtResource( 4 )
+offset_top = -8.0
+offset_right = 88.0
+offset_bottom = 8.0
+scale = Vector2(0.5, 0.5)
+theme = ExtResource("4")
 text = "Next Phase: "
 
-[node name="PauseMenu" parent="." instance=ExtResource( 1 )]
-pause_mode = 2
+[node name="PauseMenu" parent="." instance=ExtResource("1")]
 visible = false
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_right = 0.0
-margin_bottom = 0.0
 
 [connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]
diff --git a/scenes/leaderboard.tscn b/scenes/leaderboard.tscn
index e71a790..ee9e1a4 100644
--- a/scenes/leaderboard.tscn
+++ b/scenes/leaderboard.tscn
@@ -1,371 +1,296 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=7 format=3 uid="uid://kgod8xnsqa7w"]
 
-[ext_resource path="res://theme_data/interface_theme.tres" type="Theme" id=1]
-[ext_resource path="res://scripts/leaderboard.gd" type="Script" id=2]
-[ext_resource path="res://textures/retry.png" type="Texture" id=3]
-[ext_resource path="res://textures/quit_hover.png" type="Texture" id=4]
-[ext_resource path="res://textures/retry_hover.png" type="Texture" id=5]
-[ext_resource path="res://textures/quit.png" type="Texture" id=6]
+[ext_resource type="Theme" uid="uid://2jc1rrh032m0" path="res://theme_data/interface_theme.tres" id="1"]
+[ext_resource type="Script" path="res://scripts/leaderboard.gd" id="2"]
+[ext_resource type="Texture2D" uid="uid://byumgtet2e552" path="res://textures/retry.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://c1fq67yw20je5" path="res://textures/quit_hover.png" id="4"]
+[ext_resource type="Texture2D" uid="uid://cyk45edx4rokj" path="res://textures/retry_hover.png" id="5"]
+[ext_resource type="Texture2D" uid="uid://cvwyjpoqfsdc4" path="res://textures/quit.png" id="6"]
 
 [node name="Leaderboard" type="Control"]
+layout_mode = 3
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-theme = ExtResource( 1 )
-script = ExtResource( 2 )
+grow_horizontal = 2
+grow_vertical = 2
+theme = ExtResource("1")
+script = ExtResource("2")
 
 [node name="Panel" type="Panel" parent="."]
+layout_mode = 1
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
 
 [node name="GridContainer" type="GridContainer" parent="."]
+layout_mode = 1
+anchors_preset = 4
 anchor_top = 0.5
 anchor_bottom = 0.5
-margin_left = 5.0
-margin_top = -54.0
-margin_right = 125.0
-margin_bottom = 162.0
-rect_scale = Vector2( 0.5, 0.5 )
+offset_left = 4.0
+offset_top = -112.0
+offset_right = 124.0
+offset_bottom = 114.0
+grow_vertical = 2
+scale = Vector2(0.5, 0.5)
+pivot_offset = Vector2(0, 112)
+size_flags_horizontal = 0
 columns = 2
 
 [node name="NamePanel1" type="PanelContainer" parent="GridContainer"]
-margin_right = 90.0
-margin_bottom = 18.0
-rect_min_size = Vector2( 90, 0 )
+custom_minimum_size = Vector2(90, 0)
+layout_mode = 2
 
 [node name="Name" type="Label" parent="GridContainer/NamePanel1"]
-margin_left = 5.0
-margin_right = 85.0
-margin_bottom = 16.0
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
+layout_mode = 2
 text = "Name"
+vertical_alignment = 1
 
 [node name="ScorePanel1" type="PanelContainer" parent="GridContainer"]
-margin_left = 94.0
-margin_right = 120.0
-margin_bottom = 18.0
+layout_mode = 2
 
 [node name="Score" type="Label" parent="GridContainer/ScorePanel1"]
-margin_left = 5.0
-margin_right = 21.0
-margin_bottom = 16.0
+layout_mode = 2
 size_flags_horizontal = 6
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "00"
+vertical_alignment = 1
 
 [node name="NamePanel2" type="PanelContainer" parent="GridContainer"]
-margin_top = 22.0
-margin_right = 90.0
-margin_bottom = 40.0
-rect_min_size = Vector2( 90, 0 )
+custom_minimum_size = Vector2(90, 0)
+layout_mode = 2
 
 [node name="Name" type="Label" parent="GridContainer/NamePanel2"]
-margin_left = 5.0
-margin_right = 85.0
-margin_bottom = 16.0
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
+layout_mode = 2
 text = "Name"
+vertical_alignment = 1
 
 [node name="ScorePanel2" type="PanelContainer" parent="GridContainer"]
-margin_left = 94.0
-margin_top = 22.0
-margin_right = 120.0
-margin_bottom = 40.0
+layout_mode = 2
 
 [node name="Score" type="Label" parent="GridContainer/ScorePanel2"]
-margin_left = 5.0
-margin_right = 21.0
-margin_bottom = 16.0
+layout_mode = 2
 size_flags_horizontal = 6
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "00"
+vertical_alignment = 1
 
 [node name="NamePanel3" type="PanelContainer" parent="GridContainer"]
-margin_top = 44.0
-margin_right = 90.0
-margin_bottom = 62.0
-rect_min_size = Vector2( 90, 0 )
+custom_minimum_size = Vector2(90, 0)
+layout_mode = 2
 
 [node name="Name" type="Label" parent="GridContainer/NamePanel3"]
-margin_left = 5.0
-margin_right = 85.0
-margin_bottom = 16.0
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
+layout_mode = 2
 text = "Name"
+vertical_alignment = 1
 
 [node name="ScorePanel3" type="PanelContainer" parent="GridContainer"]
-margin_left = 94.0
-margin_top = 44.0
-margin_right = 120.0
-margin_bottom = 62.0
+layout_mode = 2
 
 [node name="Score" type="Label" parent="GridContainer/ScorePanel3"]
-margin_left = 5.0
-margin_right = 21.0
-margin_bottom = 16.0
+layout_mode = 2
 size_flags_horizontal = 6
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "00"
+vertical_alignment = 1
 
 [node name="NamePanel4" type="PanelContainer" parent="GridContainer"]
-margin_top = 66.0
-margin_right = 90.0
-margin_bottom = 84.0
-rect_min_size = Vector2( 90, 0 )
+custom_minimum_size = Vector2(90, 0)
+layout_mode = 2
 
 [node name="Name" type="Label" parent="GridContainer/NamePanel4"]
-margin_left = 5.0
-margin_right = 85.0
-margin_bottom = 16.0
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
+layout_mode = 2
 text = "Name"
+vertical_alignment = 1
 
 [node name="ScorePanel4" type="PanelContainer" parent="GridContainer"]
-margin_left = 94.0
-margin_top = 66.0
-margin_right = 120.0
-margin_bottom = 84.0
+layout_mode = 2
 
 [node name="Score" type="Label" parent="GridContainer/ScorePanel4"]
-margin_left = 5.0
-margin_right = 21.0
-margin_bottom = 16.0
+layout_mode = 2
 size_flags_horizontal = 6
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "00"
+vertical_alignment = 1
 
 [node name="NamePanel5" type="PanelContainer" parent="GridContainer"]
-margin_top = 88.0
-margin_right = 90.0
-margin_bottom = 106.0
-rect_min_size = Vector2( 90, 0 )
+custom_minimum_size = Vector2(90, 0)
+layout_mode = 2
 
 [node name="Name" type="Label" parent="GridContainer/NamePanel5"]
-margin_left = 5.0
-margin_right = 85.0
-margin_bottom = 16.0
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
+layout_mode = 2
 text = "Name"
+vertical_alignment = 1
 
 [node name="ScorePanel5" type="PanelContainer" parent="GridContainer"]
-margin_left = 94.0
-margin_top = 88.0
-margin_right = 120.0
-margin_bottom = 106.0
+layout_mode = 2
 
 [node name="Score" type="Label" parent="GridContainer/ScorePanel5"]
-margin_left = 5.0
-margin_right = 21.0
-margin_bottom = 16.0
+layout_mode = 2
 size_flags_horizontal = 6
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "00"
+vertical_alignment = 1
 
 [node name="NamePanel6" type="PanelContainer" parent="GridContainer"]
-margin_top = 110.0
-margin_right = 90.0
-margin_bottom = 128.0
-rect_min_size = Vector2( 90, 0 )
+custom_minimum_size = Vector2(90, 0)
+layout_mode = 2
 
 [node name="Name" type="Label" parent="GridContainer/NamePanel6"]
-margin_left = 5.0
-margin_right = 85.0
-margin_bottom = 16.0
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
+layout_mode = 2
 text = "Name"
+vertical_alignment = 1
 
 [node name="ScorePanel6" type="PanelContainer" parent="GridContainer"]
-margin_left = 94.0
-margin_top = 110.0
-margin_right = 120.0
-margin_bottom = 128.0
+layout_mode = 2
 
 [node name="Score" type="Label" parent="GridContainer/ScorePanel6"]
-margin_left = 5.0
-margin_right = 21.0
-margin_bottom = 16.0
+layout_mode = 2
 size_flags_horizontal = 6
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "00"
+vertical_alignment = 1
 
 [node name="NamePanel7" type="PanelContainer" parent="GridContainer"]
-margin_top = 132.0
-margin_right = 90.0
-margin_bottom = 150.0
-rect_min_size = Vector2( 90, 0 )
+custom_minimum_size = Vector2(90, 0)
+layout_mode = 2
 
 [node name="Name" type="Label" parent="GridContainer/NamePanel7"]
-margin_left = 5.0
-margin_right = 85.0
-margin_bottom = 16.0
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
+layout_mode = 2
 text = "Name"
+vertical_alignment = 1
 
 [node name="ScorePanel7" type="PanelContainer" parent="GridContainer"]
-margin_left = 94.0
-margin_top = 132.0
-margin_right = 120.0
-margin_bottom = 150.0
+layout_mode = 2
 
 [node name="Score" type="Label" parent="GridContainer/ScorePanel7"]
-margin_left = 5.0
-margin_right = 21.0
-margin_bottom = 16.0
+layout_mode = 2
 size_flags_horizontal = 6
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "00"
+vertical_alignment = 1
 
 [node name="NamePanel8" type="PanelContainer" parent="GridContainer"]
-margin_top = 154.0
-margin_right = 90.0
-margin_bottom = 172.0
-rect_min_size = Vector2( 90, 0 )
+custom_minimum_size = Vector2(90, 0)
+layout_mode = 2
 
 [node name="Name" type="Label" parent="GridContainer/NamePanel8"]
-margin_left = 5.0
-margin_right = 85.0
-margin_bottom = 16.0
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
+layout_mode = 2
 text = "Name"
+vertical_alignment = 1
 
 [node name="ScorePanel8" type="PanelContainer" parent="GridContainer"]
-margin_left = 94.0
-margin_top = 154.0
-margin_right = 120.0
-margin_bottom = 172.0
+layout_mode = 2
 
 [node name="Score" type="Label" parent="GridContainer/ScorePanel8"]
-margin_left = 5.0
-margin_right = 21.0
-margin_bottom = 16.0
+layout_mode = 2
 size_flags_horizontal = 6
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "00"
+vertical_alignment = 1
 
 [node name="NamePanel9" type="PanelContainer" parent="GridContainer"]
-margin_top = 176.0
-margin_right = 90.0
-margin_bottom = 194.0
-rect_min_size = Vector2( 90, 0 )
+custom_minimum_size = Vector2(90, 0)
+layout_mode = 2
 
 [node name="Name" type="Label" parent="GridContainer/NamePanel9"]
-margin_left = 5.0
-margin_right = 85.0
-margin_bottom = 16.0
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
+layout_mode = 2
 text = "Name"
+vertical_alignment = 1
 
 [node name="ScorePanel9" type="PanelContainer" parent="GridContainer"]
-margin_left = 94.0
-margin_top = 176.0
-margin_right = 120.0
-margin_bottom = 194.0
+layout_mode = 2
 
 [node name="Score" type="Label" parent="GridContainer/ScorePanel9"]
-margin_left = 5.0
-margin_right = 21.0
-margin_bottom = 16.0
+layout_mode = 2
 size_flags_horizontal = 6
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "00"
+vertical_alignment = 1
 
 [node name="NamePanel10" type="PanelContainer" parent="GridContainer"]
-margin_top = 198.0
-margin_right = 90.0
-margin_bottom = 216.0
-rect_min_size = Vector2( 90, 0 )
+custom_minimum_size = Vector2(90, 0)
+layout_mode = 2
 
 [node name="Name" type="Label" parent="GridContainer/NamePanel10"]
-margin_left = 5.0
-margin_right = 85.0
-margin_bottom = 16.0
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
+layout_mode = 2
 text = "Name"
+vertical_alignment = 1
 
 [node name="ScorePanel10" type="PanelContainer" parent="GridContainer"]
-margin_left = 94.0
-margin_top = 198.0
-margin_right = 120.0
-margin_bottom = 216.0
+layout_mode = 2
 
 [node name="Score" type="Label" parent="GridContainer/ScorePanel10"]
-margin_left = 5.0
-margin_right = 21.0
-margin_bottom = 16.0
+layout_mode = 2
 size_flags_horizontal = 6
-custom_colors/font_color_shadow = Color( 0, 0, 0, 0 )
 text = "00"
+vertical_alignment = 1
 
 [node name="Control" type="Control" parent="."]
+anchors_preset = 0
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -107.0
-margin_top = -60.0
-margin_right = 107.0
-margin_bottom = 60.0
+offset_left = -107.0
+offset_top = -60.0
+offset_right = 107.0
+offset_bottom = 60.0
 
 [node name="Label" type="Label" parent="Control"]
+layout_mode = 0
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -13.0
-margin_top = -54.0
-margin_right = 75.0
-margin_bottom = -19.0
+offset_left = -13.0
+offset_top = -54.0
+offset_right = 75.0
+offset_bottom = -19.0
 text = "Your Score:
 00"
-align = 1
+horizontal_alignment = 1
 
 [node name="HBoxContainer" type="HBoxContainer" parent="Control"]
+layout_mode = 0
 anchor_left = 1.0
 anchor_top = 0.5
 anchor_right = 1.0
 anchor_bottom = 0.5
-margin_left = -40.0
-margin_top = 40.0
-margin_right = -4.0
-margin_bottom = 56.0
+offset_left = -40.0
+offset_top = 40.0
+offset_right = -4.0
+offset_bottom = 56.0
 
 [node name="RestartButton" type="TextureButton" parent="Control/HBoxContainer"]
-margin_right = 16.0
-margin_bottom = 16.0
-focus_mode = 0
+layout_mode = 2
 size_flags_horizontal = 10
-enabled_focus_mode = 0
-texture_normal = ExtResource( 3 )
-texture_hover = ExtResource( 5 )
+focus_mode = 0
+texture_normal = ExtResource("3")
+texture_hover = ExtResource("5")
 
 [node name="QuitButton" type="TextureButton" parent="Control/HBoxContainer"]
-margin_left = 20.0
-margin_right = 36.0
-margin_bottom = 16.0
-focus_mode = 0
+layout_mode = 2
 size_flags_horizontal = 10
-enabled_focus_mode = 0
-texture_normal = ExtResource( 6 )
-texture_hover = ExtResource( 4 )
+focus_mode = 0
+texture_normal = ExtResource("6")
+texture_hover = ExtResource("4")
 
 [node name="LineEdit" type="LineEdit" parent="Control"]
-margin_left = 100.0
-margin_top = 101.0
-margin_right = 185.0
-margin_bottom = 119.0
-rect_scale = Vector2( 0.8, 0.8 )
-align = 1
+layout_mode = 0
+offset_left = 100.0
+offset_top = 101.0
+offset_right = 185.0
+offset_bottom = 119.0
+scale = Vector2(0.8, 0.8)
+placeholder_text = "ENTER NAME"
+alignment = 1
 max_length = 10
 context_menu_enabled = false
 shortcut_keys_enabled = false
 middle_mouse_paste_enabled = false
-placeholder_text = "ENTER NAME"
 
 [node name="Button" type="Button" parent="Control"]
-margin_left = 170.0
-margin_top = 101.0
-margin_right = 220.0
-margin_bottom = 119.0
-rect_scale = Vector2( 0.8, 0.8 )
+layout_mode = 0
+offset_left = 170.0
+offset_top = 101.0
+offset_right = 220.0
+offset_bottom = 119.0
+scale = Vector2(0.8, 0.8)
 text = "Submit"
 
 [connection signal="pressed" from="Control/HBoxContainer/RestartButton" to="." method="_on_RestartButton_pressed"]
diff --git a/scenes/level.tscn b/scenes/level.tscn
index 43f5689..91f685f 100644
--- a/scenes/level.tscn
+++ b/scenes/level.tscn
@@ -1,88 +1,85 @@
-[gd_scene load_steps=11 format=2]
+[gd_scene load_steps=11 format=3 uid="uid://cdtc5xcoq0iun"]
 
-[ext_resource path="res://textures/court_lines.png" type="Texture" id=1]
-[ext_resource path="res://scenes/hoop.tscn" type="PackedScene" id=2]
-[ext_resource path="res://scenes/basketball.tscn" type="PackedScene" id=3]
-[ext_resource path="res://scenes/interface.tscn" type="PackedScene" id=4]
-[ext_resource path="res://textures/court_tile.png" type="Texture" id=5]
-[ext_resource path="res://scripts/camera.gd" type="Script" id=6]
-[ext_resource path="res://scenes/audio.tscn" type="PackedScene" id=7]
+[ext_resource type="PackedScene" path="res://scenes/hoop.tscn" id="2"]
+[ext_resource type="PackedScene" uid="uid://dnb0otlc0mnc5" path="res://scenes/basketball.tscn" id="3"]
+[ext_resource type="Texture2D" uid="uid://cw2d7vif3odgj" path="res://textures/court_lines.png" id="3_y2ldl"]
+[ext_resource type="PackedScene" uid="uid://cixqgc85i5wnn" path="res://scenes/interface.tscn" id="4"]
+[ext_resource type="Texture2D" uid="uid://bnptqq0g60r6q" path="res://textures/court_tile.png" id="4_pw3tr"]
+[ext_resource type="Script" path="res://scripts/camera.gd" id="6"]
+[ext_resource type="PackedScene" uid="uid://ckf344kaw3ak6" path="res://scenes/audio.tscn" id="7"]
 
-[sub_resource type="LineShape2D" id=1]
-d = 10.0
+[sub_resource type="WorldBoundaryShape2D" id="1"]
 
-[sub_resource type="LineShape2D" id=2]
-normal = Vector2( -1, 0 )
+[sub_resource type="WorldBoundaryShape2D" id="2"]
+normal = Vector2(-1, 0)
 
-[sub_resource type="LineShape2D" id=3]
-normal = Vector2( 1, 0 )
+[sub_resource type="WorldBoundaryShape2D" id="3"]
+normal = Vector2(1, 0)
 
 [node name="Node2D" type="Node2D"]
 
 [node name="Camera2D" type="Camera2D" parent="."]
-position = Vector2( 123, 55 )
-current = true
+position = Vector2(123, 55)
 limit_left = -202
 limit_top = -202
 limit_right = 214
 limit_bottom = 120
-smoothing_enabled = true
-smoothing_speed = 7.0
-script = ExtResource( 6 )
+position_smoothing_speed = 7.0
+script = ExtResource("6")
 
-[node name="Interface" parent="." instance=ExtResource( 4 )]
+[node name="Interface" parent="." instance=ExtResource("4")]
 
 [node name="Background" type="StaticBody2D" parent="."]
 z_index = -1
 
-[node name="CourtLines" type="Sprite" parent="Background"]
-position = Vector2( 134, 56 )
-texture = ExtResource( 1 )
+[node name="CourtLines" type="Sprite2D" parent="Background"]
+position = Vector2(134, 56)
+texture = ExtResource("3_y2ldl")
 
 [node name="FloorCollider" type="CollisionShape2D" parent="Background"]
-position = Vector2( 93, 113 )
-shape = SubResource( 1 )
+position = Vector2(93, 113)
+shape = SubResource("1")
 
 [node name="CourtTile" type="TextureRect" parent="Background"]
-margin_left = -202.0
-margin_top = -8.0
-margin_right = 55.0
-margin_bottom = 120.0
+offset_left = -202.0
+offset_top = -8.0
+offset_right = 55.0
+offset_bottom = 120.0
 mouse_filter = 2
-texture = ExtResource( 5 )
-stretch_mode = 2
+texture = ExtResource("4_pw3tr")
+stretch_mode = 1
 
 [node name="RightWallCollider" type="CollisionShape2D" parent="Background"]
-position = Vector2( 194, 20 )
-shape = SubResource( 2 )
+position = Vector2(194, 20)
+shape = SubResource("2")
 
 [node name="LeftWallCollider" type="CollisionShape2D" parent="Background"]
-position = Vector2( -202, 20 )
-shape = SubResource( 3 )
+position = Vector2(-202, 20)
+shape = SubResource("3")
 
-[node name="WallCourtLines" type="Sprite" parent="Background"]
-position = Vector2( 141, -161 )
-scale = Vector2( 1, 2.55 )
-texture = ExtResource( 1 )
+[node name="WallCourtLines" type="Sprite2D" parent="Background"]
+position = Vector2(141, -161)
+scale = Vector2(1, 2.55)
+texture = ExtResource("3_y2ldl")
 centered = false
 region_enabled = true
-region_rect = Rect2( 87, 0, 73, 60 )
+region_rect = Rect2(87, 0, 73, 60)
 
-[node name="WallCourtTile" type="Sprite" parent="Background"]
-position = Vector2( -202, -161 )
-scale = Vector2( 10.719, 2.55 )
-texture = ExtResource( 5 )
+[node name="WallCourtTile" type="Sprite2D" parent="Background"]
+position = Vector2(-202, -161)
+scale = Vector2(10.719, 2.55)
+texture = ExtResource("4_pw3tr")
 centered = false
 region_enabled = true
-region_rect = Rect2( 0, 0, 32, 60 )
+region_rect = Rect2(0, 0, 32, 60)
 
-[node name="Hoop" parent="." instance=ExtResource( 2 )]
-position = Vector2( 163, 37 )
+[node name="Hoop" parent="." instance=ExtResource("2")]
+position = Vector2(163, 37)
 
-[node name="Basketball" parent="." instance=ExtResource( 3 )]
-position = Vector2( 123, 73 )
+[node name="Basketball" parent="." instance=ExtResource("3")]
+position = Vector2(123, 73)
 
-[node name="Audio" parent="." instance=ExtResource( 7 )]
+[node name="Audio" parent="." instance=ExtResource("7")]
 
 [connection signal="score" from="Hoop" to="Interface" method="_on_Hoop_score"]
 [connection signal="score" from="Hoop" to="Basketball" method="_on_Hoop_score"]
diff --git a/scenes/mainmenu.tscn b/scenes/mainmenu.tscn
index 49fed43..ea0e47d 100644
--- a/scenes/mainmenu.tscn
+++ b/scenes/mainmenu.tscn
@@ -1,88 +1,85 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=4 format=3 uid="uid://bdgohtw8nyk5g"]
 
-[ext_resource path="res://scripts/mainmenu.gd" type="Script" id=1]
-[ext_resource path="res://sound/announcer_mainmenu.ogg" type="AudioStream" id=2]
-[ext_resource path="res://theme_data/interface_theme.tres" type="Theme" id=4]
+[ext_resource type="Script" path="res://scripts/mainmenu.gd" id="1"]
+[ext_resource type="AudioStream" uid="uid://dj4raafny50wq" path="res://sound/announcer_mainmenu.ogg" id="2"]
+[ext_resource type="Theme" uid="uid://2jc1rrh032m0" path="res://theme_data/interface_theme.tres" id="4"]
 
 [node name="Menu" type="Control"]
+layout_mode = 3
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-theme = ExtResource( 4 )
-script = ExtResource( 1 )
+grow_horizontal = 2
+grow_vertical = 2
+theme = ExtResource("4")
+script = ExtResource("1")
 
 [node name="ColorRect" type="ColorRect" parent="."]
+layout_mode = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
-color = Color( 0.0823529, 0.0745098, 0.117647, 1 )
+color = Color(0.0823529, 0.0745098, 0.117647, 1)
 
 [node name="Label" type="Label" parent="."]
+layout_mode = 0
 anchor_left = 0.5
 anchor_right = 0.5
-margin_left = -48.0
-margin_right = 48.0
-margin_bottom = 16.0
+offset_left = -48.0
+offset_right = 48.0
+offset_bottom = 16.0
 text = "BasketBALLAZ"
 
 [node name="Control" type="Control" parent="."]
+anchors_preset = 0
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -107.0
-margin_top = -60.0
-margin_right = 321.0
-margin_bottom = 180.0
-rect_scale = Vector2( 0.5, 0.5 )
+offset_left = -107.0
+offset_top = -60.0
+offset_right = 321.0
+offset_bottom = 180.0
+scale = Vector2(0.5, 0.5)
 
 [node name="VBoxContainer" type="VBoxContainer" parent="Control"]
+layout_mode = 0
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -50.0
-margin_top = -76.0
-margin_right = 50.0
-margin_bottom = 76.0
+offset_left = -50.0
+offset_top = -76.0
+offset_right = 50.0
+offset_bottom = 76.0
 
 [node name="StartButton" type="Button" parent="Control/VBoxContainer"]
-margin_right = 100.0
-margin_bottom = 18.0
+layout_mode = 2
 text = "Start"
 
 [node name="LeaderboardButton" type="Button" parent="Control/VBoxContainer"]
-margin_top = 22.0
-margin_right = 100.0
-margin_bottom = 40.0
+layout_mode = 2
 text = "Leaderboard"
 
 [node name="HelpButton" type="Button" parent="Control/VBoxContainer"]
-margin_top = 44.0
-margin_right = 100.0
-margin_bottom = 62.0
+layout_mode = 2
 disabled = true
 text = "Help"
 
 [node name="OptionsButton" type="Button" parent="Control/VBoxContainer"]
-margin_top = 66.0
-margin_right = 100.0
-margin_bottom = 84.0
+layout_mode = 2
 text = "Options"
 
 [node name="CreditsButton" type="Button" parent="Control/VBoxContainer"]
-margin_top = 88.0
-margin_right = 100.0
-margin_bottom = 106.0
+layout_mode = 2
 disabled = true
 text = "Credits"
 
 [node name="QuitButton" type="Button" parent="Control/VBoxContainer"]
-margin_top = 110.0
-margin_right = 100.0
-margin_bottom = 128.0
+layout_mode = 2
 text = "Quit"
 
 [node name="AnnouncerAudio" type="AudioStreamPlayer" parent="."]
-stream = ExtResource( 2 )
+stream = ExtResource("2")
 volume_db = -15.0
 autoplay = true
 
diff --git a/scenes/optionsmenu.tscn b/scenes/optionsmenu.tscn
index c9970f6..187b7e1 100644
--- a/scenes/optionsmenu.tscn
+++ b/scenes/optionsmenu.tscn
@@ -22,107 +22,107 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -164.0
-margin_top = -49.0
-margin_right = 164.0
-margin_bottom = 49.0
-rect_scale = Vector2( 0.5, 0.5 )
-rect_pivot_offset = Vector2( 164, 49 )
+offset_left = -164.0
+offset_top = -49.0
+offset_right = 164.0
+offset_bottom = 49.0
+scale = Vector2( 0.5, 0.5 )
+pivot_offset = Vector2( 164, 49 )
 
 [node name="GridContainer" type="GridContainer" parent="Control/VBoxContainer"]
-margin_right = 328.0
-margin_bottom = 76.0
+offset_right = 328.0
+offset_bottom = 76.0
 columns = 2
 
 [node name="FullscreenLabel" type="Label" parent="Control/VBoxContainer/GridContainer"]
-margin_right = 124.0
-margin_bottom = 16.0
+offset_right = 124.0
+offset_bottom = 16.0
 text = "Fullscreen"
 
 [node name="FullscreenCheckButton" type="CheckButton" parent="Control/VBoxContainer/GridContainer"]
-margin_left = 296.0
-margin_right = 328.0
-margin_bottom = 16.0
+offset_left = 296.0
+offset_right = 328.0
+offset_bottom = 16.0
 size_flags_horizontal = 10
 
 [node name="VolumeMasterLabel" type="Label" parent="Control/VBoxContainer/GridContainer"]
-margin_top = 20.0
-margin_right = 104.0
-margin_bottom = 36.0
+offset_top = 20.0
+offset_right = 104.0
+offset_bottom = 36.0
 size_flags_horizontal = 2
 text = "Master Volume"
 
 [node name="VolumeMasterContainer" type="HBoxContainer" parent="Control/VBoxContainer/GridContainer"]
-margin_left = 128.0
-margin_top = 20.0
-margin_right = 328.0
-margin_bottom = 36.0
-rect_min_size = Vector2( 200, 0 )
+offset_left = 128.0
+offset_top = 20.0
+offset_right = 328.0
+offset_bottom = 36.0
+custom_minimum_size = Vector2( 200, 0 )
 
 [node name="VolumeMasterSlider" type="HSlider" parent="Control/VBoxContainer/GridContainer/VolumeMasterContainer"]
-margin_right = 150.0
-margin_bottom = 16.0
-rect_min_size = Vector2( 150, 0 )
+offset_right = 150.0
+offset_bottom = 16.0
+custom_minimum_size = Vector2( 150, 0 )
 
 [node name="VolumeMasterValue" type="Label" parent="Control/VBoxContainer/GridContainer/VolumeMasterContainer"]
-margin_left = 176.0
-margin_right = 200.0
-margin_bottom = 16.0
+offset_left = 176.0
+offset_right = 200.0
+offset_bottom = 16.0
 size_flags_horizontal = 10
 text = "50%"
 
 [node name="VolumeMusicLabel" type="Label" parent="Control/VBoxContainer/GridContainer"]
-margin_top = 40.0
-margin_right = 124.0
-margin_bottom = 56.0
+offset_top = 40.0
+offset_right = 124.0
+offset_bottom = 56.0
 text = "Music Volume"
 
 [node name="VolumeMusicContainer" type="HBoxContainer" parent="Control/VBoxContainer/GridContainer"]
-margin_left = 128.0
-margin_top = 40.0
-margin_right = 328.0
-margin_bottom = 56.0
+offset_left = 128.0
+offset_top = 40.0
+offset_right = 328.0
+offset_bottom = 56.0
 
 [node name="VolumeMusicSlider" type="HSlider" parent="Control/VBoxContainer/GridContainer/VolumeMusicContainer"]
-margin_right = 150.0
-margin_bottom = 16.0
-rect_min_size = Vector2( 150, 0 )
+offset_right = 150.0
+offset_bottom = 16.0
+custom_minimum_size = Vector2( 150, 0 )
 
 [node name="VolumeMusicValue" type="Label" parent="Control/VBoxContainer/GridContainer/VolumeMusicContainer"]
-margin_left = 176.0
-margin_right = 200.0
-margin_bottom = 16.0
+offset_left = 176.0
+offset_right = 200.0
+offset_bottom = 16.0
 size_flags_horizontal = 10
 text = "50%"
 
 [node name="VolumeSFXLabel" type="Label" parent="Control/VBoxContainer/GridContainer"]
-margin_top = 60.0
-margin_right = 124.0
-margin_bottom = 76.0
+offset_top = 60.0
+offset_right = 124.0
+offset_bottom = 76.0
 text = "SFX Volume"
 
 [node name="VolumeSFXContainer" type="HBoxContainer" parent="Control/VBoxContainer/GridContainer"]
-margin_left = 128.0
-margin_top = 60.0
-margin_right = 328.0
-margin_bottom = 76.0
+offset_left = 128.0
+offset_top = 60.0
+offset_right = 328.0
+offset_bottom = 76.0
 
 [node name="VolumeSFXSlider" type="HSlider" parent="Control/VBoxContainer/GridContainer/VolumeSFXContainer"]
-margin_right = 150.0
-margin_bottom = 16.0
-rect_min_size = Vector2( 150, 0 )
+offset_right = 150.0
+offset_bottom = 16.0
+custom_minimum_size = Vector2( 150, 0 )
 
 [node name="VolumeSFXValue" type="Label" parent="Control/VBoxContainer/GridContainer/VolumeSFXContainer"]
-margin_left = 176.0
-margin_right = 200.0
-margin_bottom = 16.0
+offset_left = 176.0
+offset_right = 200.0
+offset_bottom = 16.0
 size_flags_horizontal = 10
 text = "50%"
 
 [node name="ReturnButton" type="Button" parent="Control/VBoxContainer"]
-margin_top = 80.0
-margin_right = 328.0
-margin_bottom = 98.0
+offset_top = 80.0
+offset_right = 328.0
+offset_bottom = 98.0
 text = "Return"
 
 [connection signal="toggled" from="Control/VBoxContainer/GridContainer/FullscreenCheckButton" to="." method="_on_FullscreenCheckButton_toggled"]
diff --git a/scenes/pausemenu.tscn b/scenes/pausemenu.tscn
index e23e95c..60fae1a 100644
--- a/scenes/pausemenu.tscn
+++ b/scenes/pausemenu.tscn
@@ -1,89 +1,90 @@
-[gd_scene load_steps=11 format=2]
+[gd_scene load_steps=11 format=3 uid="uid://dgeurb05rmq88"]
 
-[ext_resource path="res://scripts/pausemenu.gd" type="Script" id=1]
-[ext_resource path="res://textures/options_hover.png" type="Texture" id=2]
-[ext_resource path="res://textures/options.png" type="Texture" id=3]
-[ext_resource path="res://textures/retry_hover.png" type="Texture" id=4]
-[ext_resource path="res://textures/retry.png" type="Texture" id=5]
-[ext_resource path="res://textures/quit_hover.png" type="Texture" id=6]
-[ext_resource path="res://textures/quit.png" type="Texture" id=7]
-[ext_resource path="res://textures/help.png" type="Texture" id=8]
-[ext_resource path="res://textures/help_hover.png" type="Texture" id=9]
-[ext_resource path="res://theme_data/interface_theme.tres" type="Theme" id=10]
+[ext_resource type="Script" path="res://scripts/pausemenu.gd" id="1"]
+[ext_resource type="Texture2D" uid="uid://b4ywdgjr33qbm" path="res://textures/options_hover.png" id="2"]
+[ext_resource type="Texture2D" uid="uid://c1lg2y0602jok" path="res://textures/options.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://cyk45edx4rokj" path="res://textures/retry_hover.png" id="4"]
+[ext_resource type="Texture2D" uid="uid://byumgtet2e552" path="res://textures/retry.png" id="5"]
+[ext_resource type="Texture2D" uid="uid://c1fq67yw20je5" path="res://textures/quit_hover.png" id="6"]
+[ext_resource type="Texture2D" uid="uid://cvwyjpoqfsdc4" path="res://textures/quit.png" id="7"]
+[ext_resource type="Texture2D" uid="uid://bjun0ox7x2xmh" path="res://textures/help.png" id="8"]
+[ext_resource type="Texture2D" uid="uid://dkb835ytdw7j7" path="res://textures/help_hover.png" id="9"]
+[ext_resource type="Theme" uid="uid://2jc1rrh032m0" path="res://theme_data/interface_theme.tres" id="10"]
 
 [node name="PauseMenu" type="Control"]
-margin_right = 214.0
-margin_bottom = 120.0
-theme = ExtResource( 10 )
-script = ExtResource( 1 )
+process_mode = 3
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme = ExtResource("10")
+script = ExtResource("1")
 
 [node name="ColorRect" type="ColorRect" parent="."]
+layout_mode = 1
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-color = Color( 0, 0, 0, 0.54902 )
-__meta__ = {
-"_edit_use_anchors_": true
-}
+grow_horizontal = 2
+grow_vertical = 2
+color = Color(0, 0, 0, 0.54902)
 
 [node name="Panel" type="Panel" parent="."]
+layout_mode = 0
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -43.0
-margin_top = -26.0
-margin_right = 43.0
-margin_bottom = 13.0
+offset_left = -43.0
+offset_top = -26.0
+offset_right = 43.0
+offset_bottom = 13.0
 
 [node name="HoverLabel" type="Label" parent="."]
+layout_mode = 0
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -38.0
-margin_top = -25.0
-margin_right = 38.0
-margin_bottom = -9.0
+offset_left = -38.0
+offset_top = -25.0
+offset_right = 38.0
+offset_bottom = -9.0
 text = "PAUSED"
-align = 1
-valign = 1
+horizontal_alignment = 1
 
 [node name="HBoxContainer" type="HBoxContainer" parent="."]
+layout_mode = 0
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -38.0
-margin_top = -8.0
-margin_right = 38.0
-margin_bottom = 8.0
+offset_left = -38.0
+offset_top = -8.0
+offset_right = 38.0
+offset_bottom = 8.0
 
 [node name="RestartButton" type="TextureButton" parent="HBoxContainer"]
-margin_right = 16.0
-margin_bottom = 16.0
-texture_normal = ExtResource( 5 )
-texture_hover = ExtResource( 4 )
+layout_mode = 2
+texture_normal = ExtResource("5")
+texture_hover = ExtResource("4")
 
 [node name="OptionsButton" type="TextureButton" parent="HBoxContainer"]
-margin_left = 20.0
-margin_right = 36.0
-margin_bottom = 16.0
-texture_normal = ExtResource( 3 )
-texture_hover = ExtResource( 2 )
+layout_mode = 2
+texture_normal = ExtResource("3")
+texture_hover = ExtResource("2")
 
 [node name="HelpButton" type="TextureButton" parent="HBoxContainer"]
-margin_left = 40.0
-margin_right = 56.0
-margin_bottom = 16.0
-texture_normal = ExtResource( 8 )
-texture_hover = ExtResource( 9 )
+layout_mode = 2
+texture_normal = ExtResource("8")
+texture_hover = ExtResource("9")
 
 [node name="QuitButton" type="TextureButton" parent="HBoxContainer"]
-margin_left = 60.0
-margin_right = 76.0
-margin_bottom = 16.0
-texture_normal = ExtResource( 7 )
-texture_hover = ExtResource( 6 )
+layout_mode = 2
+texture_normal = ExtResource("7")
+texture_hover = ExtResource("6")
 
 [connection signal="mouse_entered" from="ColorRect" to="." method="_on_ColorRect_mouse_entered"]
 [connection signal="mouse_entered" from="Panel" to="." method="_on_Panel_mouse_entered"]
diff --git a/scenes/splashscreen.tscn b/scenes/splashscreen.tscn
index 44c82df..66d9b37 100644
--- a/scenes/splashscreen.tscn
+++ b/scenes/splashscreen.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://sound/desksmashers.ogg" type="AudioStream" id=1]
-[ext_resource path="res://desksmashers.svg" type="Texture" id=2]
+[ext_resource path="res://desksmashers.svg" type="Texture2D" id=2]
 [ext_resource path="res://scripts/splashscreen.gd" type="Script" id=3]
 
 [sub_resource type="Animation" id=1]
@@ -13,8 +13,8 @@ tracks/0/loop_wrap = true
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
+"times": PackedFloat32Array( 0 ),
+"transitions": PackedFloat32Array( 1 ),
 "update": 0,
 "values": [ Color( 1, 1, 1, 0 ) ]
 }
@@ -29,8 +29,8 @@ tracks/0/loop_wrap = true
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/keys = {
-"times": PoolRealArray( 0, 0.5, 2, 3.5, 5, 5.5 ),
-"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ),
+"times": PackedFloat32Array( 0, 0.5, 2, 3.5, 5, 5.5 ),
+"transitions": PackedFloat32Array( 1, 1, 1, 1, 1, 1 ),
 "update": 0,
 "values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ) ]
 }
@@ -46,7 +46,7 @@ tracks/1/keys = {
 "start_offset": 0.0,
 "stream": ExtResource( 1 )
 } ],
-"times": PoolRealArray( 1.5 )
+"times": PackedFloat32Array( 1.5 )
 }
 
 [node name="SplashScreen" type="Control"]
@@ -73,13 +73,13 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -48.0
-margin_top = 29.0
-margin_right = 48.0
-margin_bottom = 45.0
+offset_left = -48.0
+offset_top = 29.0
+offset_right = 48.0
+offset_bottom = 45.0
 text = "desksmashers"
 
-[node name="Sprite" type="Sprite" parent="Logo/Label"]
+[node name="Sprite2D" type="Sprite2D" parent="Logo/Label"]
 position = Vector2( 48, -30 )
 scale = Vector2( 0.05, 0.05 )
 texture = ExtResource( 2 )