diff --git a/objects/environment/turret/turret.tscn b/objects/environment/turret/turret.tscn
index b8c1998..860be13 100644
--- a/objects/environment/turret/turret.tscn
+++ b/objects/environment/turret/turret.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=21 format=2]
+[gd_scene load_steps=19 format=2]
 
 [ext_resource path="res://objects/environment/turret/turret.gd" type="Script" id=1]
 [ext_resource path="res://graphics/enemy/turret.png" type="Texture" id=2]
@@ -306,27 +306,6 @@ graph_offset = Vector2( -880, -243 )
 [sub_resource type="Curve" id=15]
 _data = [ Vector2( 0, 1 ), 0.0, -2.23455, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ]
 
-[sub_resource type="CurveTexture" id=16]
-width = 32
-curve = SubResource( 15 )
-
-[sub_resource type="ParticlesMaterial" id=17]
-emission_shape = 2
-emission_box_extents = Vector3( 2, 0, 0 )
-flag_disable_z = true
-direction = Vector3( 0, 1, 0 )
-spread = 60.0
-gravity = Vector3( 0, 0, 0 )
-initial_velocity = 50.0
-orbit_velocity = 0.0
-orbit_velocity_random = 0.0
-angle = 720.0
-angle_random = 1.0
-scale = 0.25
-scale_random = 0.5
-scale_curve = SubResource( 16 )
-color = Color( 1, 0.968627, 0.431373, 1 )
-
 [node name="Turret" type="Node2D"]
 script = ExtResource( 1 )
 fire_rate = 20.0
@@ -365,10 +344,21 @@ __meta__ = {
 "_gizmo_extents_": 2.0
 }
 
-[node name="MuzzleFlash" type="Particles2D" parent="BarrelStart/BarrelEnd"]
+[node name="MuzzleFlash" type="CPUParticles2D" parent="BarrelStart/BarrelEnd"]
 z_index = -1
 emitting = false
 lifetime = 0.15
 explosiveness = 0.5
-process_material = SubResource( 17 )
 texture = ExtResource( 3 )
+emission_shape = 2
+emission_rect_extents = Vector2( 2, 0 )
+direction = Vector2( 0, 1 )
+spread = 60.0
+gravity = Vector2( 0, 0 )
+initial_velocity = 50.0
+angle = 720.0
+angle_random = 1.0
+scale_amount = 0.25
+scale_amount_random = 0.5
+scale_amount_curve = SubResource( 15 )
+color = Color( 1, 0.968627, 0.431373, 1 )
diff --git a/objects/player/arrow_projectile.tscn b/objects/player/arrow_projectile.tscn
index dd624ab..54d3f9f 100644
--- a/objects/player/arrow_projectile.tscn
+++ b/objects/player/arrow_projectile.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=1]
 [ext_resource path="res://graphics/player/arrow.png" type="Texture" id=2]
@@ -13,50 +13,12 @@ shader_param/border_corners = true
 [sub_resource type="Curve" id=3]
 _data = [ Vector2( 0, 1 ), 0.0, -0.139481, 0, 0, Vector2( 1, 0 ), -2.82064, 0.0, 0, 0 ]
 
-[sub_resource type="CurveTexture" id=4]
-width = 32
-curve = SubResource( 3 )
-
-[sub_resource type="ParticlesMaterial" id=5]
-flag_disable_z = true
-spread = 180.0
-gravity = Vector3( 0, 0, 0 )
-initial_velocity = 8.0
-initial_velocity_random = 0.18
-orbit_velocity = 0.0
-orbit_velocity_random = 0.0
-damping = 1.0
-angle = 720.0
-angle_random = 1.0
-scale = 0.25
-scale_random = 0.25
-scale_curve = SubResource( 4 )
-
 [sub_resource type="RectangleShape2D" id=2]
 extents = Vector2( 5.5, 3.5 )
 
 [sub_resource type="Curve" id=6]
 _data = [ Vector2( 0, 1 ), 0.0, -1.45746, 0, 0, Vector2( 1, 0 ), 0.00323196, 0.0, 0, 0 ]
 
-[sub_resource type="CurveTexture" id=7]
-width = 32
-curve = SubResource( 6 )
-
-[sub_resource type="ParticlesMaterial" id=8]
-flag_disable_z = true
-spread = 180.0
-gravity = Vector3( 0, 0, 0 )
-initial_velocity = 30.0
-initial_velocity_random = 0.5
-orbit_velocity = 0.0
-orbit_velocity_random = 0.0
-damping = 50.0
-angle = 720.0
-angle_random = 1.0
-scale = 0.3
-scale_curve = SubResource( 7 )
-color = Color( 1, 1, 0.290196, 1 )
-
 [node name="ArrowProjectile" type="Node2D"]
 script = ExtResource( 3 )
 
@@ -65,14 +27,23 @@ material = SubResource( 1 )
 z_index = -1
 texture = ExtResource( 2 )
 
-[node name="DustParticles" type="Particles2D" parent="."]
+[node name="DustParticles" type="CPUParticles2D" parent="."]
 show_behind_parent = true
 position = Vector2( -4, 0 )
 z_index = -1
 amount = 24
 local_coords = false
-process_material = SubResource( 5 )
 texture = ExtResource( 4 )
+spread = 180.0
+gravity = Vector2( 0, 0 )
+initial_velocity = 8.0
+initial_velocity_random = 0.18
+damping = 1.0
+angle = 720.0
+angle_random = 1.0
+scale_amount = 0.25
+scale_amount_random = 0.25
+scale_amount_curve = SubResource( 3 )
 
 [node name="Hitbox" type="Area2D" parent="." groups=["arrow"]]
 
@@ -80,15 +51,24 @@ texture = ExtResource( 4 )
 position = Vector2( -0.5, -0.5 )
 shape = SubResource( 2 )
 
-[node name="SparkParticles" type="Particles2D" parent="."]
+[node name="SparkParticles" type="CPUParticles2D" parent="."]
 position = Vector2( 4, 0 )
 emitting = false
 amount = 16
 lifetime = 0.5
 one_shot = true
 explosiveness = 1.0
-process_material = SubResource( 8 )
 texture = ExtResource( 4 )
+spread = 180.0
+gravity = Vector2( 0, 0 )
+initial_velocity = 30.0
+initial_velocity_random = 0.5
+damping = 50.0
+angle = 720.0
+angle_random = 1.0
+scale_amount = 0.3
+scale_amount_curve = SubResource( 6 )
+color = Color( 1, 1, 0.290196, 1 )
 
 [connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"]
 [connection signal="body_entered" from="Hitbox" to="." method="_on_Hitbox_body_entered"]