diff --git a/content/main.tscn b/content/main.tscn
index 581f3a4..e7035a0 100644
--- a/content/main.tscn
+++ b/content/main.tscn
@@ -37,6 +37,7 @@ script = ExtResource("1_uvrd4")
 
 [node name="XRCamera3D" type="XRCamera3D" parent="XROrigin3D"]
 transform = Transform3D(1, 1.8976e-10, 4.07454e-10, 6.76872e-11, 1, 2.08738e-08, -5.82077e-11, 1.04592e-11, 1, 0.0356618, 0.71033, 0.00564247)
+current = true
 
 [node name="XRControllerLeft" parent="XROrigin3D" instance=ExtResource("2_2lraw")]
 transform = Transform3D(0.999999, -1.39633e-11, 0, 9.48075e-12, 1, 0, 0, 0, 1, -0.355145, 0.550439, -0.477945)
diff --git a/content/ui/menu/room/window.tscn b/content/ui/menu/room/window.tscn
index 476a09c..312244b 100644
--- a/content/ui/menu/room/window.tscn
+++ b/content/ui/menu/room/window.tscn
@@ -1,6 +1,5 @@
-[gd_scene load_steps=6 format=3 uid="uid://scu77f1crn6"]
+[gd_scene load_steps=4 format=3 uid="uid://scu77f1crn6"]
 
-[ext_resource type="Script" path="res://content/functions/movable.gd" id="2_g70gm"]
 [ext_resource type="Texture2D" uid="uid://ddkdqduooyt5e" path="res://assets/ComfyUI_00480_2.png" id="3_qlot3"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xx1h5"]
@@ -11,18 +10,7 @@ albedo_texture = ExtResource("3_qlot3")
 size = Vector2(1, 1)
 orientation = 2
 
-[sub_resource type="BoxShape3D" id="BoxShape3D_00pto"]
-size = Vector3(1, 1, 0.02)
-
-[node name="Window" type="StaticBody3D"]
-
-[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+[node name="MeshInstance3D" type="MeshInstance3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.000999987)
 material_override = SubResource("StandardMaterial3D_xx1h5")
 mesh = SubResource("PlaneMesh_ndue5")
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-shape = SubResource("BoxShape3D_00pto")
-
-[node name="Movable" type="Node" parent="."]
-script = ExtResource("2_g70gm")
diff --git a/content/ui/menu/room/windows.tscn b/content/ui/menu/room/windows.tscn
index 0d88302..9e5e420 100644
--- a/content/ui/menu/room/windows.tscn
+++ b/content/ui/menu/room/windows.tscn
@@ -1,29 +1,63 @@
-[gd_scene load_steps=2 format=3 uid="uid://bubusve8ijc7h"]
+[gd_scene load_steps=5 format=3 uid="uid://bubusve8ijc7h"]
 
 [ext_resource type="PackedScene" uid="uid://scu77f1crn6" path="res://content/ui/menu/room/window.tscn" id="1_nl1ra"]
+[ext_resource type="Script" path="res://content/functions/movable.gd" id="2_tt5ej"]
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_gsqto"]
+size = Vector3(0.86, 1.58, 0.07)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_a74ne"]
+size = Vector3(0.75, 2.37, 0.09)
 
 [node name="Windows" type="Node3D"]
 
-[node name="Window" parent="." instance=ExtResource("1_nl1ra")]
-transform = Transform3D(0.32, 0, 0, 0, 1.04, 0, 0, 0, 1, 0, 0, 0)
+[node name="StaticBody3D" type="StaticBody3D" parent="."]
 
-[node name="Window3" parent="." instance=ExtResource("1_nl1ra")]
-transform = Transform3D(0.32, 0, 0, 0, 1.04, 0, 0, 0, 1, 0.49, 0, 0)
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.27, 0)
+shape = SubResource("BoxShape3D_gsqto")
 
-[node name="Window2" parent="." instance=ExtResource("1_nl1ra")]
-transform = Transform3D(0.76, 0, 0, 0, 0.35, 0, 0, 0, 1, 0.26, 0.71, -0.04)
+[node name="Window" parent="StaticBody3D" instance=ExtResource("1_nl1ra")]
+transform = Transform3D(0.32, 0, 0, 0, 1.04, 0, 0, 0, 1, -0.23, 0, 0.001)
+skeleton = NodePath("../..")
 
-[node name="Window8" parent="." instance=ExtResource("1_nl1ra")]
-transform = Transform3D(0.76, 0, 0, 0, 0.35, 0, 0, 0, 1, 1.67, 1.84, -0.04)
+[node name="Window3" parent="StaticBody3D" instance=ExtResource("1_nl1ra")]
+transform = Transform3D(0.32, 0, 0, 0, 1.04, 0, 0, 0, 1, 0.23, 0, 0.001)
+skeleton = NodePath("../..")
 
-[node name="Window4" parent="." instance=ExtResource("1_nl1ra")]
-transform = Transform3D(0.34, 0, 0, 0, 1.03, 0, 0, 0, 1, 1.45, 1.1, -0.03)
+[node name="Window2" parent="StaticBody3D" instance=ExtResource("1_nl1ra")]
+transform = Transform3D(0.76, 0, 0, 0, 0.35, 0, 0, 0, 1, 0, 0.88, 0)
+skeleton = NodePath("../..")
 
-[node name="Window5" parent="." instance=ExtResource("1_nl1ra")]
-transform = Transform3D(0.34, 0, 0, 0, 1.03, 0, 0, 0, 1, 1.9, 1.1, -0.03)
+[node name="Movable2" type="Node" parent="StaticBody3D"]
+script = ExtResource("2_tt5ej")
 
-[node name="Window6" parent="." instance=ExtResource("1_nl1ra")]
-transform = Transform3D(0.34, 0, 0, 0, 0.73, 0, 0, 0, 1, 1.45, 0.14, -0.03)
+[node name="StaticBody3D2" type="StaticBody3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.35061, 0, 0)
 
-[node name="Window7" parent="." instance=ExtResource("1_nl1ra")]
-transform = Transform3D(0.34, 0, 0, 0, 0.73, 0, 0, 0, 1, 1.9, 0.14, -0.03)
+[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.39, 0)
+shape = SubResource("BoxShape3D_a74ne")
+
+[node name="Window8" parent="StaticBody3D2" instance=ExtResource("1_nl1ra")]
+transform = Transform3D(0.76, 0, 0, 0, 0.35, 0, 0, 0, 1, 0, 1.39, 0)
+skeleton = NodePath("../..")
+
+[node name="Window4" parent="StaticBody3D2" instance=ExtResource("1_nl1ra")]
+transform = Transform3D(0.34, 0, 0, 0, 1.03, 0, 0, 0, 1, -0.21, 0.52, 0)
+skeleton = NodePath("../..")
+
+[node name="Window5" parent="StaticBody3D2" instance=ExtResource("1_nl1ra")]
+transform = Transform3D(0.34, 0, 0, 0, 1.03, 0, 0, 0, 1, 0.21, 0.52, 0)
+skeleton = NodePath("../..")
+
+[node name="Window6" parent="StaticBody3D2" instance=ExtResource("1_nl1ra")]
+transform = Transform3D(0.34, 0, 0, 0, 0.73, 0, 0, 0, 1, 0.21, -0.44, 0)
+skeleton = NodePath("../..")
+
+[node name="Window7" parent="StaticBody3D2" instance=ExtResource("1_nl1ra")]
+transform = Transform3D(0.34, 0, 0, 0, 0.73, 0, 0, 0, 1, -0.21, -0.44, 0)
+skeleton = NodePath("../..")
+
+[node name="Movable" type="Node" parent="StaticBody3D2"]
+script = ExtResource("2_tt5ej")