diff --git a/project.godot b/project.godot
index dfb574a..0b37a6e 100644
--- a/project.godot
+++ b/project.godot
@@ -23,6 +23,7 @@ window/size/viewport_height=1080
 window/size/mode=3
 window/size/borderless=true
 window/stretch/mode="viewport"
+window/stretch/aspect="expand"
 
 [editor]
 
diff --git a/scenes/UI/End.tscn b/scenes/UI/End.tscn
index 36defbc..f28c8ff 100644
--- a/scenes/UI/End.tscn
+++ b/scenes/UI/End.tscn
@@ -1,7 +1,6 @@
-[gd_scene load_steps=3 format=3 uid="uid://8rtse17u7bqg"]
+[gd_scene load_steps=2 format=3 uid="uid://8rtse17u7bqg"]
 
 [ext_resource type="Script" path="res://scripts/End.gd" id="1_0587q"]
-[ext_resource type="PackedScene" uid="uid://cnp8h65468543" path="res://scenes/overlays/crt_overlay.tscn" id="2_teww6"]
 
 [node name="End" type="Control"]
 layout_mode = 3
@@ -36,7 +35,4 @@ layout_mode = 2
 text = "Try again
 "
 
-[node name="CRT_Overlay" parent="." instance=ExtResource("2_teww6")]
-layout_mode = 1
-
 [connection signal="button_up" from="CenterContainer/VBoxContainer/Label2" to="." method="_on_play"]
diff --git a/scenes/UI/Splash.tscn b/scenes/UI/Splash.tscn
index 9cd16f0..d533a82 100644
--- a/scenes/UI/Splash.tscn
+++ b/scenes/UI/Splash.tscn
@@ -1,40 +1,14 @@
-[gd_scene load_steps=10 format=3 uid="uid://dvt585i7m0286"]
+[gd_scene load_steps=7 format=3 uid="uid://dvt585i7m0286"]
 
 [ext_resource type="Script" path="res://scripts/Splash.gd" id="1_3yqra"]
-[ext_resource type="Shader" path="res://shaders/pend00-crt-vhs.gdshader" id="2_0jwol"]
 [ext_resource type="Shader" path="res://shaders/Splash.gdshader" id="2_5fbyd"]
 [ext_resource type="Texture2D" uid="uid://bdshi27v4osg2" path="res://icons/yorchnet_pixel_64.png" id="2_fpfqa"]
-[ext_resource type="PackedScene" uid="uid://cnp8h65468543" path="res://scenes/overlays/crt_overlay.tscn" id="5_jurjp"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_ijjp2"]
 shader = ExtResource("2_5fbyd")
 shader_parameter/flap_speed = 4.0
 shader_parameter/scale = 4.0
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_yxw0u"]
-shader = ExtResource("2_0jwol")
-shader_parameter/overlay = true
-shader_parameter/scanlines_opacity = 0.125
-shader_parameter/scanlines_width = 0.125
-shader_parameter/grille_opacity = 0.125
-shader_parameter/resolution = Vector2(640, 320)
-shader_parameter/pixelate = false
-shader_parameter/roll = true
-shader_parameter/roll_speed = 1.0
-shader_parameter/roll_size = 0.8
-shader_parameter/roll_variation = 2.574
-shader_parameter/distort_intensity = 0.0
-shader_parameter/noise_opacity = 0.05
-shader_parameter/noise_speed = 5.0
-shader_parameter/static_noise_intensity = 0.06
-shader_parameter/aberration = 0.00500005
-shader_parameter/brightness = 1.4
-shader_parameter/discolor = true
-shader_parameter/warp_amount = 0.0
-shader_parameter/clip_warp = false
-shader_parameter/vignette_intensity = 0.1
-shader_parameter/vignette_opacity = 0.5
-
 [sub_resource type="Animation" id="Animation_2v5v3"]
 resource_name = "animation"
 length = 3.0
@@ -93,28 +67,6 @@ material = SubResource("ShaderMaterial_ijjp2")
 layout_mode = 2
 texture = ExtResource("2_fpfqa")
 
-[node name="Control" type="Control" parent="."]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-mouse_filter = 2
-
-[node name="ColorRect" type="ColorRect" parent="Control"]
-modulate = Color(1, 1, 1, 0.101961)
-light_mask = 0
-z_as_relative = false
-material = SubResource("ShaderMaterial_yxw0u")
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-mouse_filter = 2
-
 [node name="ColorRect" type="ColorRect" parent="."]
 layout_mode = 1
 anchors_preset = 15
@@ -129,6 +81,3 @@ libraries = {
 "": SubResource("AnimationLibrary_sansa")
 }
 autoplay = "animation"
-
-[node name="CRT_Overlay" parent="." instance=ExtResource("5_jurjp")]
-layout_mode = 1
diff --git a/scenes/UI/Start.tscn b/scenes/UI/Start.tscn
index 24b33e3..08371a4 100644
--- a/scenes/UI/Start.tscn
+++ b/scenes/UI/Start.tscn
@@ -1,7 +1,6 @@
-[gd_scene load_steps=3 format=3 uid="uid://o0c5ir7543g1"]
+[gd_scene load_steps=2 format=3 uid="uid://o0c5ir7543g1"]
 
 [ext_resource type="Script" path="res://scripts/End.gd" id="1_jfc42"]
-[ext_resource type="PackedScene" uid="uid://cnp8h65468543" path="res://scenes/overlays/crt_overlay.tscn" id="2_6myhp"]
 
 [node name="MainMenu" type="Control"]
 layout_mode = 3
@@ -85,8 +84,5 @@ focus_previous = NodePath("../Button04")
 text = "Quit
 "
 
-[node name="CRT_Overlay" parent="." instance=ExtResource("2_6myhp")]
-layout_mode = 1
-
 [connection signal="button_up" from="CenterContainer/VBoxContainer/Button01" to="." method="_on_play"]
 [connection signal="button_up" from="CenterContainer/VBoxContainer/Button05" to="." method="_on_quit"]
diff --git a/scenes/UI/Win.tscn b/scenes/UI/Win.tscn
index 8be089c..7bba337 100644
--- a/scenes/UI/Win.tscn
+++ b/scenes/UI/Win.tscn
@@ -1,7 +1,6 @@
-[gd_scene load_steps=3 format=3 uid="uid://8euefl26umu1"]
+[gd_scene load_steps=2 format=3 uid="uid://8euefl26umu1"]
 
 [ext_resource type="Script" path="res://scripts/End.gd" id="1_oljih"]
-[ext_resource type="PackedScene" uid="uid://cnp8h65468543" path="res://scenes/overlays/crt_overlay.tscn" id="2_48jpk"]
 
 [node name="End" type="Control"]
 layout_mode = 3
@@ -35,7 +34,4 @@ horizontal_alignment = 1
 layout_mode = 2
 text = "Play Again?"
 
-[node name="CRT_Overlay" parent="." instance=ExtResource("2_48jpk")]
-layout_mode = 1
-
 [connection signal="button_up" from="CenterContainer/VBoxContainer/Label2" to="." method="_on_play"]
diff --git a/scenes/main.tscn b/scenes/main.tscn
index f864102..68dd6a7 100644
--- a/scenes/main.tscn
+++ b/scenes/main.tscn
@@ -1,6 +1,7 @@
-[gd_scene load_steps=2 format=3 uid="uid://dsqm17w8hg428"]
+[gd_scene load_steps=3 format=3 uid="uid://dsqm17w8hg428"]
 
 [ext_resource type="Script" path="res://scripts/World.gd" id="1_131aq"]
+[ext_resource type="PackedScene" uid="uid://cnp8h65468543" path="res://scenes/overlays/crt_overlay.tscn" id="2_xf15f"]
 
 [node name="World" type="Node2D"]
 script = ExtResource("1_131aq")
@@ -10,4 +11,6 @@ one_shot = true
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 
+[node name="CRT_Overlay" parent="." instance=ExtResource("2_xf15f")]
+
 [connection signal="timeout" from="Timer" to="." method="_on_timeout"]
diff --git a/scenes/overlays/crt_overlay.tscn b/scenes/overlays/crt_overlay.tscn
index 9f6e372..6c9cd2f 100644
--- a/scenes/overlays/crt_overlay.tscn
+++ b/scenes/overlays/crt_overlay.tscn
@@ -26,20 +26,12 @@ shader_parameter/clip_warp = false
 shader_parameter/vignette_intensity = 0.1
 shader_parameter/vignette_opacity = 0.5
 
-[node name="CRT_Overlay" type="Control"]
-layout_mode = 3
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-mouse_filter = 2
+[node name="CRT_Overlay" type="CanvasLayer"]
 
 [node name="ColorRect" type="ColorRect" parent="."]
 light_mask = 0
 z_as_relative = false
 material = SubResource("ShaderMaterial_vmiki")
-layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0