From a7fa0f9356bf64d554bfe0d28a2a80cdb8f35066 Mon Sep 17 00:00:00 2001
From: scove <Trannguyenp303@gmail.com>
Date: Fri, 5 Jun 2026 22:38:32 +0700
Subject: [PATCH] update

---
 .idea/.idea.HALLUCINATE/.idea/workspace.xml   | 38 ++++++++++----
 Assets/Prefabs/NPC/xNPC.prefab                |  2 +-
 .../Prefabs/projectile/_LazerPrọectile.prefab | 38 ++++++++++++--
 Assets/Scenes/Cho môn AI/Only AI.unity        |  2 +-
 Assets/Scripts/AI NPC/LaserProjectile.cs      | 50 +++++++++++++++----
 .../vThirdPersonController.cs                 |  8 +++
 .../Hallucinate.UI.Components.xsd             | 45 +++++++++++++++++
 UIElementsSchema/UIElements.xsd               |  3 +-
 .../Unity.Multiplayer.PlayMode.Editor.xsd     |  2 +-
 .../Unity.Profiling.Editor.UI.xsd             |  2 +-
 UIElementsSchema/Unity.Profiling.Editor.xsd   |  2 +-
 UIElementsSchema/Unity.UI.Builder.xsd         |  2 +-
 UIElementsSchema/Unity.UIToolkit.Editor.xsd   |  2 +-
 .../UnityEditor.Accessibility.xsd             | 12 ++---
 .../UnityEditor.Audio.UIElements.xsd          |  2 +-
 .../UnityEditor.Experimental.GraphView.xsd    |  4 +-
 ...r.Inspector.GraphicsSettingsInspectors.xsd |  2 +-
 UIElementsSchema/UnityEditor.Inspector.xsd    |  2 +-
 UIElementsSchema/UnityEditor.Overlays.xsd     |  2 +-
 ...UnityEditor.PackageManager.UI.Internal.xsd |  2 +-
 UIElementsSchema/UnityEditor.Rendering.xsd    |  2 +-
 UIElementsSchema/UnityEditor.Search.xsd       |  2 +-
 .../UnityEditor.ShaderGraph.Drawing.xsd       |  2 +-
 .../UnityEditor.ShortcutManagement.xsd        |  2 +-
 UIElementsSchema/UnityEditor.Toolbars.xsd     |  2 +-
 ...ityEditor.U2D.Sprites.SpriteEditorTool.xsd |  2 +-
 .../UnityEditor.UIElements.Debugger.xsd       |  2 +-
 ...UnityEditor.UIElements.ProjectSettings.xsd |  2 +-
 UIElementsSchema/UnityEditor.UIElements.xsd   |  2 +-
 UIElementsSchema/UnityEngine.UIElements.xsd   |  2 +-
 30 files changed, 186 insertions(+), 56 deletions(-)
 create mode 100644 UIElementsSchema/Hallucinate.UI.Components.xsd

diff --git a/.idea/.idea.HALLUCINATE/.idea/workspace.xml b/.idea/.idea.HALLUCINATE/.idea/workspace.xml
index 05103c03..5a086632 100644
--- a/.idea/.idea.HALLUCINATE/.idea/workspace.xml
+++ b/.idea/.idea.HALLUCINATE/.idea/workspace.xml
@@ -7,17 +7,33 @@
     <list default="true" id="f9183c68-daf0-43b8-be4c-fad79983f91b" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/Prefabs/NPC/xNPC.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/NPC/xNPC.prefab" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Prefabs/projectile/_LazerPrọectile.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/projectile/_LazerPrọectile.prefab" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/Scenes/Cho môn AI/Only AI.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Cho môn AI/Only AI.unity" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scenes/Cho môn AI/Only AI/NavMesh-NavManager 1.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Cho môn AI/Only AI/NavMesh-NavManager 1.asset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scenes/Cho môn AI/Only AI/NavMesh-NavManager 1.asset.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Cho môn AI/Only AI/NavMesh-NavManager 1.asset.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/AI NPC/EnemyAI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/AI NPC/EnemyAI.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/AI NPC/GeminiService.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/AI NPC/GeminiService.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/AI NPC/GeminiTest.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/AI NPC/GeminiTest.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/AI NPC/GerminiNPC.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/AI NPC/GerminiNPC.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/FootStep/Editor/vFootStepEditor.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/FootStep/Editor/vFootStepEditor.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/FootStep/Scripts/vFootStep.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/FootStep/Scripts/vFootStep.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/Generic/Utils/Editor/Resources/EntityPreview/EntityPreview.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/Generic/Utils/Editor/Resources/EntityPreview/EntityPreview.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/Third Parties/TextMesh Pro/Resources/Fonts &amp; Materials/LiberationSans SDF - Fallback.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/TextMesh Pro/Resources/Fonts &amp; Materials/LiberationSans SDF - Fallback.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/AI NPC/LaserProjectile.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/AI NPC/LaserProjectile.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/CharacterController/vThirdPersonController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/CharacterController/vThirdPersonController.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UIElements.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UIElements.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/Unity.Multiplayer.PlayMode.Editor.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/Unity.Multiplayer.PlayMode.Editor.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/Unity.Profiling.Editor.UI.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/Unity.Profiling.Editor.UI.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/Unity.Profiling.Editor.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/Unity.Profiling.Editor.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/Unity.UI.Builder.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/Unity.UI.Builder.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/Unity.UIToolkit.Editor.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/Unity.UIToolkit.Editor.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Accessibility.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Accessibility.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Audio.UIElements.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Audio.UIElements.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Experimental.GraphView.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Experimental.GraphView.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Inspector.GraphicsSettingsInspectors.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Inspector.GraphicsSettingsInspectors.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Inspector.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Inspector.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Overlays.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Overlays.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.PackageManager.UI.Internal.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.PackageManager.UI.Internal.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Rendering.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Rendering.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Search.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Search.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.ShaderGraph.Drawing.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.ShaderGraph.Drawing.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.ShortcutManagement.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.ShortcutManagement.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Toolbars.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.Toolbars.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.U2D.Sprites.SpriteEditorTool.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.U2D.Sprites.SpriteEditorTool.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.UIElements.ProjectSettings.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.UIElements.ProjectSettings.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.UIElements.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEditor.UIElements.xsd" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/UIElementsSchema/UnityEngine.UIElements.xsd" beforeDir="false" afterPath="$PROJECT_DIR$/UIElementsSchema/UnityEngine.UIElements.xsd" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -187,7 +203,7 @@
       <workItem from="1780364354282" duration="4357000" />
       <workItem from="1780409218377" duration="9852000" />
       <workItem from="1780494322686" duration="643000" />
-      <workItem from="1780633654231" duration="20541000" />
+      <workItem from="1780633654231" duration="23904000" />
     </task>
     <servers />
   </component>
diff --git a/Assets/Prefabs/NPC/xNPC.prefab b/Assets/Prefabs/NPC/xNPC.prefab
index fe08f0a0..d3ac66f4 100644
--- a/Assets/Prefabs/NPC/xNPC.prefab
+++ b/Assets/Prefabs/NPC/xNPC.prefab
@@ -609,7 +609,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7522161431095319480}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 35bba55c2a743d042ab1fff35e29db50, type: 3}
   m_Name: 
diff --git a/Assets/Prefabs/projectile/_LazerPrọectile.prefab b/Assets/Prefabs/projectile/_LazerPrọectile.prefab
index 78737243..64fc3b19 100644
--- a/Assets/Prefabs/projectile/_LazerPrọectile.prefab
+++ b/Assets/Prefabs/projectile/_LazerPrọectile.prefab
@@ -14,6 +14,7 @@ GameObject:
   - component: {fileID: 411349647056113735}
   - component: {fileID: 2417107839128453854}
   - component: {fileID: 6433774282585127385}
+  - component: {fileID: -8021594009672363794}
   m_Layer: 0
   m_Name: "_LazerPr\u1ECDectile"
   m_TagString: Untagged
@@ -31,8 +32,8 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0.69, z: 0.267}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.05, y: 0.05, z: 0.05}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -108,7 +109,7 @@ SphereCollider:
     serializedVersion: 2
     m_Bits: 0
   m_LayerOverridePriority: 0
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
@@ -245,5 +246,34 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e4f602386d4d484ea7a2a3b0c19ac21, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::LaserProjectile
-  speed: 5
+  speed: 100
   lifeTime: 5
+  damageAmount: 10
+  hitSound: Laser_Hit
+--- !u!54 &-8021594009672363794
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3965388737199864462}
+  serializedVersion: 5
+  m_Mass: 1
+  m_LinearDamping: 0
+  m_AngularDamping: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
diff --git a/Assets/Scenes/Cho môn AI/Only AI.unity b/Assets/Scenes/Cho môn AI/Only AI.unity
index 4692d679..4a1e9f7c 100644
--- a/Assets/Scenes/Cho môn AI/Only AI.unity	
+++ b/Assets/Scenes/Cho môn AI/Only AI.unity	
@@ -136487,7 +136487,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::Hallucinate.AI.GeminiService
   apiKeys:
   - AIzaSyC4DRm2dffDuDogYkY0Ag86p-EYLu67bDo
-  - AIzaSyC4DRm2dffDuDogYkY0Ag86p-EYLu67bDo
+  - AQ.Ab8RN6JvwHD9tZXWlO7eb22ahV0rxUh5cAjB3-XfKW5H_KLiyQ
   - AIzaSyC4DRm2dffDuDogYkY0Ag86p-EYLu67bDo
   geminiURL: https://generativelanguage.googleapis.com/v1beta/models/gemini-flash-latest:generateContent
 --- !u!1 &1143870345
diff --git a/Assets/Scripts/AI NPC/LaserProjectile.cs b/Assets/Scripts/AI NPC/LaserProjectile.cs
index 017700c6..a0155230 100644
--- a/Assets/Scripts/AI NPC/LaserProjectile.cs	
+++ b/Assets/Scripts/AI NPC/LaserProjectile.cs	
@@ -1,36 +1,66 @@
 using UnityEngine;
 using Hallucinate.Audio;
+using Invector;
 
 public class LaserProjectile : MonoBehaviour
 {
-    public float speed = 5f;
+    public float speed = 15f; // Tăng tốc độ đạn để cảm giác mượt hơn
     public float lifeTime = 5f;
+    public int damageAmount = 10;
 
     [Header("Audio")]
     public string hitSound = "Laser_Hit";
 
     private void Start()
     {
+        // Tự hủy sau một khoảng thời gian nếu không trúng gì
         Destroy(gameObject, lifeTime);
     }
 
     private void Update()
     {
-        transform.position +=
-            transform.forward *
-            speed *
-            Time.deltaTime;
+        // Di chuyển đạn
+        transform.position += transform.forward * speed * Time.deltaTime;
     }
 
     private void OnTriggerEnter(Collider other)
     {
-        if (other.CompareTag("Player"))
+        // Debug: Log tên và tag của bất cứ thứ gì đạn chạm vào
+        Debug.Log($"Laser collided with: {other.name} | Tag: {other.tag} | Layer: {LayerMask.LayerToName(other.gameObject.layer)}");
+
+        // Kiểm tra nếu trúng Player
+        if (other.CompareTag("Player") || other.GetComponentInParent<vIHealthController>() != null)
         {
-            Debug.Log("Player Hit");
+            var healthController = other.GetComponentInParent<vIHealthController>();
+            
+            if (healthController != null)
+            {
+                Debug.Log($"<color=red>HIT PLAYER!</color> Found health controller on {healthController.gameObject.name}. Applying {damageAmount} damage.");
+                var damage = new vDamage(damageAmount);
+                damage.sender = transform;
+                damage.hitPosition = transform.position;
+                healthController.TakeDamage(damage);
+            }
+            
+            // Luôn phá hủy đạn khi trúng Player
+            Impact();
+            return;
+        }
 
-            AudioManager.Instance?.Play(hitSound, position: transform.position);
-
-            Destroy(gameObject);
+        // Phá hủy đạn nếu trúng tường, sàn nhà (mọi thứ không phải trigger khác)
+        if (!other.isTrigger)
+        {
+            Debug.Log("Laser hit an obstacle (Wall/Floor).");
+            Impact();
         }
     }
+
+    private void Impact()
+    {
+        // Chạy âm thanh
+        AudioManager.Instance?.Play(hitSound, position: transform.position);
+        
+        // Phá hủy đạn ngay lập tức
+        Destroy(gameObject);
+    }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/Player/CharacterController/vThirdPersonController.cs b/Assets/Scripts/Player/CharacterController/vThirdPersonController.cs
index f03a5a7a..c7c918b8 100644
--- a/Assets/Scripts/Player/CharacterController/vThirdPersonController.cs
+++ b/Assets/Scripts/Player/CharacterController/vThirdPersonController.cs
@@ -318,6 +318,14 @@ namespace Invector.vCharacterController
             currentStaminaRecoveryDelay = 2f;
         }
 
+        public override void TakeDamage(vDamage damage)
+        {
+            Debug.Log($"Player TakeDamage called. Damage: {damage.damageValue}. Current Health before: {currentHealth}");
+            base.TakeDamage(damage);
+            Debug.Log($"Player Health after: {currentHealth}");
+            // Additional logic for player-specific damage handling can be added here
+        }
+
 
         #region Check Action Triggers 
 
diff --git a/UIElementsSchema/Hallucinate.UI.Components.xsd b/UIElementsSchema/Hallucinate.UI.Components.xsd
new file mode 100644
index 00000000..66650ddc
--- /dev/null
+++ b/UIElementsSchema/Hallucinate.UI.Components.xsd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="Hallucinate.UI.Components" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
+  <xs:simpleType name="VectorShapeElement_shape-type_Type">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Pill" />
+      <xs:enumeration value="Polygon" />
+      <xs:enumeration value="Star" />
+      <xs:enumeration value="CustomPath" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="VectorShapeElementType">
+    <xs:complexContent mixed="false">
+      <xs:restriction base="engine:VisualElementType">
+        <xs:sequence minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="engine:VisualElement" />
+        </xs:sequence>
+        <xs:attribute default="" name="name" type="xs:string" use="optional" />
+        <xs:attribute default="true" name="enabled" type="xs:boolean" use="optional" />
+        <xs:attribute default="" name="view-data-key" type="xs:string" use="optional" />
+        <xs:attribute default="Position" name="picking-mode" type="engine:VisualElement_picking-mode_Type" use="optional" />
+        <xs:attribute default="" name="tooltip" type="xs:string" use="optional" />
+        <xs:attribute default="None" name="usage-hints" type="engine:VisualElement_usage-hints_Type" use="optional" />
+        <xs:attribute default="0" name="tabindex" type="xs:int" use="optional" />
+        <xs:attribute default="false" name="focusable" type="xs:boolean" use="optional" />
+        <xs:attribute default="" name="class" type="xs:string" use="optional" />
+        <xs:attribute default="" name="content-container" type="xs:string" use="optional" />
+        <xs:attribute default="" name="style" type="xs:string" use="optional" />
+        <xs:attribute default="null" name="data-source" type="xs:string" use="optional" />
+        <xs:attribute default="" name="data-source-path" type="xs:string" use="optional" />
+        <xs:attribute default="null" name="data-source-type" type="xs:string" use="optional" />
+        <xs:attribute default="Pill" name="shape-type" type="VectorShapeElement_shape-type_Type" use="optional" />
+        <xs:attribute default="RGBA(1.000, 1.000, 1.000, 1.000)" name="fill-color" type="xs:string" use="optional" />
+        <xs:attribute default="RGBA(0.000, 0.000, 0.000, 1.000)" name="stroke-color" type="xs:string" use="optional" />
+        <xs:attribute default="2" name="stroke-width" type="xs:float" use="optional" />
+        <xs:attribute default="10" name="corner-radius" type="xs:float" use="optional" />
+        <xs:attribute default="5" name="sides" type="xs:int" use="optional" />
+        <xs:attribute default="0.5" name="star-inwardness" type="xs:float" use="optional" />
+        <xs:attribute default="" name="path-data" type="xs:string" use="optional" />
+        <xs:anyAttribute processContents="lax" />
+      </xs:restriction>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:element name="VectorShapeElement" substitutionGroup="engine:VisualElement" type="VectorShapeElementType" />
+</xs:schema>
\ No newline at end of file
diff --git a/UIElementsSchema/UIElements.xsd b/UIElementsSchema/UIElements.xsd
index 87e75bca..66720b0f 100644
--- a/UIElementsSchema/UIElements.xsd
+++ b/UIElementsSchema/UIElements.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:import schemaLocation="UnityEditor.ShaderGraph.Drawing.xsd" namespace="UnityEditor.ShaderGraph.Drawing" />
   <xs:import schemaLocation="UnityEditor.Rendering.xsd" namespace="UnityEditor.Rendering" />
@@ -22,4 +22,5 @@
   <xs:import schemaLocation="Unity.Profiling.Editor.xsd" namespace="Unity.Profiling.Editor" />
   <xs:import schemaLocation="UnityEditor.Inspector.GraphicsSettingsInspectors.xsd" namespace="UnityEditor.Inspector.GraphicsSettingsInspectors" />
   <xs:import schemaLocation="UnityEditor.Accessibility.xsd" namespace="UnityEditor.Accessibility" />
+  <xs:import schemaLocation="Hallucinate.UI.Components.xsd" namespace="Hallucinate.UI.Components" />
 </xs:schema>
\ No newline at end of file
diff --git a/UIElementsSchema/Unity.Multiplayer.PlayMode.Editor.xsd b/UIElementsSchema/Unity.Multiplayer.PlayMode.Editor.xsd
index f3cfe0c7..f405e94c 100644
--- a/UIElementsSchema/Unity.Multiplayer.PlayMode.Editor.xsd
+++ b/UIElementsSchema/Unity.Multiplayer.PlayMode.Editor.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="Unity.Multiplayer.PlayMode.Editor" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="Unity.Multiplayer.PlayMode.Editor" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="PlayersListViewType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/Unity.Profiling.Editor.UI.xsd b/UIElementsSchema/Unity.Profiling.Editor.UI.xsd
index f70d3a50..0c8042a8 100644
--- a/UIElementsSchema/Unity.Profiling.Editor.UI.xsd
+++ b/UIElementsSchema/Unity.Profiling.Editor.UI.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="Unity.Profiling.Editor.UI" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="Unity.Profiling.Editor.UI" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="BoxPlotGraphType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/Unity.Profiling.Editor.xsd b/UIElementsSchema/Unity.Profiling.Editor.xsd
index e61bc51e..e8aaa8a4 100644
--- a/UIElementsSchema/Unity.Profiling.Editor.xsd
+++ b/UIElementsSchema/Unity.Profiling.Editor.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="Unity.Profiling.Editor" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="Unity.Profiling.Editor" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:simpleType name="SelectableLabel_vertical-scroller-visibility_Type">
     <xs:restriction base="xs:string">
diff --git a/UIElementsSchema/Unity.UI.Builder.xsd b/UIElementsSchema/Unity.UI.Builder.xsd
index f306e663..49c7c46b 100644
--- a/UIElementsSchema/Unity.UI.Builder.xsd
+++ b/UIElementsSchema/Unity.UI.Builder.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="Unity.UI.Builder" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="Unity.UI.Builder" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="CategoryDropdownFieldType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/Unity.UIToolkit.Editor.xsd b/UIElementsSchema/Unity.UIToolkit.Editor.xsd
index 9124366b..17076465 100644
--- a/UIElementsSchema/Unity.UIToolkit.Editor.xsd
+++ b/UIElementsSchema/Unity.UIToolkit.Editor.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="Unity.UIToolkit.Editor" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="Unity.UIToolkit.Editor" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="VisualElementInspectorType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEditor.Accessibility.xsd b/UIElementsSchema/UnityEditor.Accessibility.xsd
index 4921c116..4311a384 100644
--- a/UIElementsSchema/UnityEditor.Accessibility.xsd
+++ b/UIElementsSchema/UnityEditor.Accessibility.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.Accessibility" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.Accessibility" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:simpleType name="AccessibilityHierarchyTreeViewItem_role_Type">
     <xs:restriction base="xs:string">
@@ -38,7 +38,7 @@
         <xs:attribute default="false" name="is-root" type="xs:boolean" use="optional" />
         <xs:attribute default="0" name="id" type="xs:int" use="optional" />
         <xs:attribute default="" name="label" type="xs:string" use="optional" />
-        <xs:attribute default="None" name="role" type="AccessibilityHierarchyTreeViewItem_role_Type" use="optional" />
+        <xs:attribute default="None" name="role" xmlns:q1="UnityEditor.Accessibility" type="q1:AccessibilityHierarchyTreeViewItem_role_Type" use="optional" />
         <xs:attribute default="false" name="is-active" type="xs:boolean" use="optional" />
         <xs:attribute default="" name="content-container" type="xs:string" use="optional" />
         <xs:attribute default="" name="class" type="xs:string" use="optional" />
@@ -47,7 +47,7 @@
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="AccessibilityHierarchyTreeViewItem" substitutionGroup="engine:VisualElement" type="AccessibilityHierarchyTreeViewItemType" />
+  <xs:element name="AccessibilityHierarchyTreeViewItem" substitutionGroup="engine:VisualElement" xmlns:q2="UnityEditor.Accessibility" type="q2:AccessibilityHierarchyTreeViewItemType" />
   <xs:complexType name="AccessibilityHierarchyTreeViewType">
     <xs:complexContent mixed="false">
       <xs:restriction base="engine:VisualElementType">
@@ -70,7 +70,7 @@
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="AccessibilityHierarchyTreeView" substitutionGroup="engine:VisualElement" type="AccessibilityHierarchyTreeViewType" />
+  <xs:element name="AccessibilityHierarchyTreeView" substitutionGroup="engine:VisualElement" xmlns:q3="UnityEditor.Accessibility" type="q3:AccessibilityHierarchyTreeViewType" />
   <xs:complexType name="TreeViewSearchBarType">
     <xs:complexContent mixed="false">
       <xs:restriction base="engine:VisualElementType">
@@ -93,7 +93,7 @@
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="TreeViewSearchBar" substitutionGroup="engine:VisualElement" type="TreeViewSearchBarType" />
+  <xs:element name="TreeViewSearchBar" substitutionGroup="engine:VisualElement" xmlns:q4="UnityEditor.Accessibility" type="q4:TreeViewSearchBarType" />
   <xs:complexType name="SearchableLabelType">
     <xs:complexContent mixed="false">
       <xs:restriction base="engine:VisualElementType">
@@ -117,5 +117,5 @@
       </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="SearchableLabel" substitutionGroup="engine:VisualElement" type="SearchableLabelType" />
+  <xs:element name="SearchableLabel" substitutionGroup="engine:VisualElement" xmlns:q5="UnityEditor.Accessibility" type="q5:SearchableLabelType" />
 </xs:schema>
\ No newline at end of file
diff --git a/UIElementsSchema/UnityEditor.Audio.UIElements.xsd b/UIElementsSchema/UnityEditor.Audio.UIElements.xsd
index 21c31779..74e05ec3 100644
--- a/UIElementsSchema/UnityEditor.Audio.UIElements.xsd
+++ b/UIElementsSchema/UnityEditor.Audio.UIElements.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.Audio.UIElements" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.Audio.UIElements" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="AudioRandomRangeSliderTrackerType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEditor.Experimental.GraphView.xsd b/UIElementsSchema/UnityEditor.Experimental.GraphView.xsd
index bd6b835d..7f5f7d01 100644
--- a/UIElementsSchema/UnityEditor.Experimental.GraphView.xsd
+++ b/UIElementsSchema/UnityEditor.Experimental.GraphView.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.Experimental.GraphView" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.Experimental.GraphView" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="ResizableElementType">
     <xs:complexContent mixed="false">
@@ -54,7 +54,7 @@
       <xs:restriction base="engine:VisualElementType">
         <xs:attribute default="" name="name" type="xs:string" use="optional" />
         <xs:attribute default="true" name="enabled" type="xs:boolean" use="optional" />
-        <xs:attribute default="ed122612-cfc1-4459-a53f-86c166494d5d" name="view-data-key" type="xs:string" use="optional" />
+        <xs:attribute default="94681326-b8dc-4220-b769-78e48dd96237" name="view-data-key" type="xs:string" use="optional" />
         <xs:attribute default="Position" name="picking-mode" type="engine:VisualElement_picking-mode_Type" use="optional" />
         <xs:attribute default="" name="tooltip" type="xs:string" use="optional" />
         <xs:attribute default="None" name="usage-hints" type="engine:VisualElement_usage-hints_Type" use="optional" />
diff --git a/UIElementsSchema/UnityEditor.Inspector.GraphicsSettingsInspectors.xsd b/UIElementsSchema/UnityEditor.Inspector.GraphicsSettingsInspectors.xsd
index 01ed10db..2296bda4 100644
--- a/UIElementsSchema/UnityEditor.Inspector.GraphicsSettingsInspectors.xsd
+++ b/UIElementsSchema/UnityEditor.Inspector.GraphicsSettingsInspectors.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.Inspector.GraphicsSettingsInspectors" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.Inspector.GraphicsSettingsInspectors" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="GraphicsSettingsInspectorTierSettingsType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEditor.Inspector.xsd b/UIElementsSchema/UnityEditor.Inspector.xsd
index 392fb799..fdc2dacb 100644
--- a/UIElementsSchema/UnityEditor.Inspector.xsd
+++ b/UIElementsSchema/UnityEditor.Inspector.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.Inspector" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.Inspector" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="ClippingPlanesType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEditor.Overlays.xsd b/UIElementsSchema/UnityEditor.Overlays.xsd
index 4632a4d6..5eaf771f 100644
--- a/UIElementsSchema/UnityEditor.Overlays.xsd
+++ b/UIElementsSchema/UnityEditor.Overlays.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.Overlays" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.Overlays" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="AnchoredOverlayContainerType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEditor.PackageManager.UI.Internal.xsd b/UIElementsSchema/UnityEditor.PackageManager.UI.Internal.xsd
index 46b52097..b58e3930 100644
--- a/UIElementsSchema/UnityEditor.PackageManager.UI.Internal.xsd
+++ b/UIElementsSchema/UnityEditor.PackageManager.UI.Internal.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.PackageManager.UI.Internal" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.PackageManager.UI.Internal" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:simpleType name="PackageListView_virtualization-method_Type">
     <xs:restriction base="xs:string">
diff --git a/UIElementsSchema/UnityEditor.Rendering.xsd b/UIElementsSchema/UnityEditor.Rendering.xsd
index 99dd0559..fd55f33e 100644
--- a/UIElementsSchema/UnityEditor.Rendering.xsd
+++ b/UIElementsSchema/UnityEditor.Rendering.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.Rendering" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.Rendering" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="HeaderFoldoutType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEditor.Search.xsd b/UIElementsSchema/UnityEditor.Search.xsd
index 5b6c9fe3..4e9ca54c 100644
--- a/UIElementsSchema/UnityEditor.Search.xsd
+++ b/UIElementsSchema/UnityEditor.Search.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.Search" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.Search" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="ObjectFieldType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEditor.ShaderGraph.Drawing.xsd b/UIElementsSchema/UnityEditor.ShaderGraph.Drawing.xsd
index 7c7e46d5..68876f74 100644
--- a/UIElementsSchema/UnityEditor.ShaderGraph.Drawing.xsd
+++ b/UIElementsSchema/UnityEditor.ShaderGraph.Drawing.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.ShaderGraph.Drawing" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.ShaderGraph.Drawing" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:simpleType name="IdentifierField_vertical-scroller-visibility_Type">
     <xs:restriction base="xs:string">
diff --git a/UIElementsSchema/UnityEditor.ShortcutManagement.xsd b/UIElementsSchema/UnityEditor.ShortcutManagement.xsd
index e3ce1d18..770aa66c 100644
--- a/UIElementsSchema/UnityEditor.ShortcutManagement.xsd
+++ b/UIElementsSchema/UnityEditor.ShortcutManagement.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.ShortcutManagement" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.ShortcutManagement" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="ShortcutSearchFieldType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEditor.Toolbars.xsd b/UIElementsSchema/UnityEditor.Toolbars.xsd
index ee114446..bbfbf54b 100644
--- a/UIElementsSchema/UnityEditor.Toolbars.xsd
+++ b/UIElementsSchema/UnityEditor.Toolbars.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.Toolbars" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.Toolbars" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="MainToolbarKebabButtonType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEditor.U2D.Sprites.SpriteEditorTool.xsd b/UIElementsSchema/UnityEditor.U2D.Sprites.SpriteEditorTool.xsd
index 7a96da9a..93cd14bb 100644
--- a/UIElementsSchema/UnityEditor.U2D.Sprites.SpriteEditorTool.xsd
+++ b/UIElementsSchema/UnityEditor.U2D.Sprites.SpriteEditorTool.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.U2D.Sprites.SpriteEditorTool" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.U2D.Sprites.SpriteEditorTool" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="SpriteOutlineToolOverlayPanelType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd b/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd
index d863ebf2..b55d2e18 100644
--- a/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd
+++ b/UIElementsSchema/UnityEditor.UIElements.Debugger.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.UIElements.Debugger" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.UIElements.Debugger" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="EventTypeSearchFieldType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEditor.UIElements.ProjectSettings.xsd b/UIElementsSchema/UnityEditor.UIElements.ProjectSettings.xsd
index 2f969737..6beca655 100644
--- a/UIElementsSchema/UnityEditor.UIElements.ProjectSettings.xsd
+++ b/UIElementsSchema/UnityEditor.UIElements.ProjectSettings.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.UIElements.ProjectSettings" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.UIElements.ProjectSettings" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="ProjectSettingsSectionType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEditor.UIElements.xsd b/UIElementsSchema/UnityEditor.UIElements.xsd
index e88c8727..b32a6b74 100644
--- a/UIElementsSchema/UnityEditor.UIElements.xsd
+++ b/UIElementsSchema/UnityEditor.UIElements.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEditor.UIElements" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEditor.UIElements" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:import schemaLocation="UnityEngine.UIElements.xsd" namespace="UnityEngine.UIElements" />
   <xs:complexType name="InspectorElementType">
     <xs:complexContent mixed="false">
diff --git a/UIElementsSchema/UnityEngine.UIElements.xsd b/UIElementsSchema/UnityEngine.UIElements.xsd
index 4edacdf1..f75da44b 100644
--- a/UIElementsSchema/UnityEngine.UIElements.xsd
+++ b/UIElementsSchema/UnityEngine.UIElements.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="UnityEditor.Accessibility" elementFormDefault="qualified" targetNamespace="UnityEngine.UIElements" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:editor="UnityEditor.UIElements" xmlns:engine="UnityEngine.UIElements" xmlns="Hallucinate.UI.Components" elementFormDefault="qualified" targetNamespace="UnityEngine.UIElements" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:simpleType name="VisualElement_picking-mode_Type">
     <xs:restriction base="xs:string">
       <xs:enumeration value="Position" />