diff --git a/scenes/Entities/Rosa.tscn b/scenes/Entities/Rosa.tscn
index ccfabb7..e625d0c 100644
--- a/scenes/Entities/Rosa.tscn
+++ b/scenes/Entities/Rosa.tscn
@@ -13,6 +13,7 @@ height = 0.804274
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_fegux"]
 render_priority = 0
 shader = ExtResource("3_j5vis")
+shader_parameter/color = Color(0.931725, 0.000206962, 0.803019, 1)
 shader_parameter/frame = 0
 shader_parameter/direction = 1
 
diff --git a/scenes/Entities/TestNPC.tscn b/scenes/Entities/TestNPC.tscn
index b7bd6e7..8904785 100644
--- a/scenes/Entities/TestNPC.tscn
+++ b/scenes/Entities/TestNPC.tscn
@@ -13,6 +13,7 @@ height = 0.804274
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_l4utx"]
 render_priority = 0
 shader = ExtResource("1_xgcv1")
+shader_parameter/color = Color(0, 0.563816, 0, 1)
 shader_parameter/frame = 0
 shader_parameter/direction = 1
 
diff --git a/scenes/Maps/SomeMap.tscn b/scenes/Maps/SomeMap.tscn
index 5c0aa9b..d458491 100644
--- a/scenes/Maps/SomeMap.tscn
+++ b/scenes/Maps/SomeMap.tscn
@@ -53,12 +53,16 @@ shadow_normal_bias = 0.9
 omni_range = 281.646
 
 [node name="Map" type="Node3D" parent="."]
+metadata/_edit_lock_ = true
 
 [node name="Ground" type="StaticBody3D" parent="Map"]
+metadata/_edit_lock_ = true
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="Map/Ground"]
 mesh = SubResource("BoxMesh_s8iqe")
 surface_material_override/0 = SubResource("ShaderMaterial_s8iqe")
+metadata/_edit_lock_ = true
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Map/Ground"]
 shape = SubResource("BoxShape3D_s8iqe")
+metadata/_edit_lock_ = true
diff --git a/scripts/Cutscene/TestCutscene.gd b/scripts/Cutscene/TestCutscene.gd
index d2e2fe6..5c16025 100644
--- a/scripts/Cutscene/TestCutscene.gd
+++ b/scripts/Cutscene/TestCutscene.gd
@@ -5,6 +5,6 @@ func _init(speaker:OverworldEntity, interacted:OverworldEntity ) -> void:
 		speaker,
 		interacted,
 		[
-			"Hello"
+			"Hello, my name is GREEN and I am an NPC."
 		]
 	);
diff --git a/scripts/Entities/OverworldEntity.gd b/scripts/Entities/OverworldEntity.gd
index 6cb7dd9..9744074 100644
--- a/scripts/Entities/OverworldEntity.gd
+++ b/scripts/Entities/OverworldEntity.gd
@@ -148,8 +148,8 @@ func _process(delta:float) -> void:
 
 	# Handle entity leaving map bounds
 	if !withinMapBounds:
-		if !withinBoundsLastFrame:
-			print("Entity ", self.name, " was out of map bounds for two frames");
+		# if !withinBoundsLastFrame:
+			# print("Entity ", self.name, " was out of map bounds for two frames");
 		withinBoundsLastFrame = false;
 	else:
 		withinBoundsLastFrame = true;
diff --git a/scripts/player.gd.uid b/scripts/player.gd.uid
new file mode 100644
index 0000000..e6c35d4
--- /dev/null
+++ b/scripts/player.gd.uid
@@ -0,0 +1 @@
+uid://bemw1wubl22hp
diff --git a/shaders/NPC Shader.gdshader b/shaders/NPC Shader.gdshader
index 58cd4d6..1998bb3 100644
--- a/shaders/NPC Shader.gdshader	
+++ b/shaders/NPC Shader.gdshader	
@@ -2,6 +2,7 @@ shader_type spatial;
 render_mode cull_disabled;
 
 uniform sampler2D npcTexture : filter_nearest;
+uniform vec4 color : source_color;
 uniform int frame;
 uniform int direction;
 
@@ -35,5 +36,5 @@ void fragment() {
 	if(npcColor.r == 0.00392156862745 && npcColor.g == 1.0 && npcColor.b == 0.0)
 		discard;
 
-	ALBEDO.rgb = npcColor.rgb;
+	ALBEDO.rgb = npcColor.rgb * color.rgb;
 }
diff --git a/ui/UI Theme.tres b/ui/UI Theme.tres
index 4a24d4d..11f8631 100644
--- a/ui/UI Theme.tres	
+++ b/ui/UI Theme.tres	
@@ -1,9 +1,6 @@
-[gd_resource type="Theme" load_steps=3 format=3 uid="uid://dm7ee4aqjr2dl"]
-
-[ext_resource type="Texture2D" uid="uid://63qoqwcwjrdr" path="res://textures/ui/ui_frame.png" id="1_wss1l"]
+[gd_resource type="Theme" load_steps=2 format=3 uid="uid://dm7ee4aqjr2dl"]
 
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_linbi"]
-texture = ExtResource("1_wss1l")
 texture_margin_left = 14.0
 texture_margin_top = 14.0
 texture_margin_right = 14.0