diff --git a/.gitignore b/.gitignore
index d92c9cc733..80170358cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
-.idea
+**/.idea
 *.rsuser
 *.suo
 *.user
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..3e69f97bea
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "external/XamlX"]
+	path = external/XamlX
+	url = git@github.com:kekekeks/XamlX.git
diff --git a/external/.gitkeep.txt b/external/.gitkeep.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/external/XamlX b/external/XamlX
new file mode 160000
index 0000000000..5420df861c
--- /dev/null
+++ b/external/XamlX
@@ -0,0 +1 @@
+Subproject commit 5420df861ce6f2be5ead9efa078fe7242ce88f18
diff --git a/XamlNameReferenceGenerator.Sandbox/App.xaml b/src/XamlNameReferenceGenerator.Sandbox/App.xaml
similarity index 100%
rename from XamlNameReferenceGenerator.Sandbox/App.xaml
rename to src/XamlNameReferenceGenerator.Sandbox/App.xaml
diff --git a/XamlNameReferenceGenerator.Sandbox/App.xaml.cs b/src/XamlNameReferenceGenerator.Sandbox/App.xaml.cs
similarity index 100%
rename from XamlNameReferenceGenerator.Sandbox/App.xaml.cs
rename to src/XamlNameReferenceGenerator.Sandbox/App.xaml.cs
diff --git a/XamlNameReferenceGenerator.Sandbox/Controls/CustomTextBox.cs b/src/XamlNameReferenceGenerator.Sandbox/Controls/CustomTextBox.cs
similarity index 100%
rename from XamlNameReferenceGenerator.Sandbox/Controls/CustomTextBox.cs
rename to src/XamlNameReferenceGenerator.Sandbox/Controls/CustomTextBox.cs
diff --git a/XamlNameReferenceGenerator.Sandbox/Program.cs b/src/XamlNameReferenceGenerator.Sandbox/Program.cs
similarity index 86%
rename from XamlNameReferenceGenerator.Sandbox/Program.cs
rename to src/XamlNameReferenceGenerator.Sandbox/Program.cs
index 4e8b7b98ad..f28ce4d379 100644
--- a/XamlNameReferenceGenerator.Sandbox/Program.cs
+++ b/src/XamlNameReferenceGenerator.Sandbox/Program.cs
@@ -1,6 +1,4 @@
-using System;
-using Avalonia;
-using Avalonia.Logging.Serilog;
+using Avalonia;
 using Avalonia.ReactiveUI;
 
 namespace XamlNameReferenceGenerator.Sandbox
diff --git a/XamlNameReferenceGenerator.Sandbox/SignUpView.xaml b/src/XamlNameReferenceGenerator.Sandbox/SignUpView.xaml
similarity index 77%
rename from XamlNameReferenceGenerator.Sandbox/SignUpView.xaml
rename to src/XamlNameReferenceGenerator.Sandbox/SignUpView.xaml
index 5e58f95202..168b6e7bce 100644
--- a/XamlNameReferenceGenerator.Sandbox/SignUpView.xaml
+++ b/src/XamlNameReferenceGenerator.Sandbox/SignUpView.xaml
@@ -4,23 +4,24 @@
         xmlns:controls="clr-namespace:XamlNameReferenceGenerator.Sandbox.Controls"
         x:Class="XamlNameReferenceGenerator.Sandbox.SignUpView">
     <StackPanel>
+        <!-- Regular name directives. -->
         <controls:CustomTextBox Margin="0 10 0 0"
-                               x:Name="UserNameTextBox"
-                               Watermark="Please, enter user name..."
-                               UseFloatingWatermark="True" />
-        <TextBlock x:Name="UserNameValidation"
+                                Name="UserNameTextBox"
+                                Watermark="Please, enter user name..."
+                                UseFloatingWatermark="True" />
+        <TextBlock Name="UserNameValidation"
                    Foreground="Red"
                    FontSize="12" />
-
         <TextBox Margin="0 10 0 0"
-                 x:Name="PasswordTextBox"
+                 Name="PasswordTextBox"
                  Watermark="Please, enter your password..."
                  UseFloatingWatermark="True"
                  PasswordChar="*" />
-        <TextBlock x:Name="PasswordValidation"
+        <TextBlock Name="PasswordValidation"
                    Foreground="Red"
                    FontSize="12" />
 
+        <!-- x:Name directives. -->
         <TextBox Margin="0 10 0 0"
                  x:Name="ConfirmPasswordTextBox"
                  Watermark="Please, confirm the password..."
@@ -30,7 +31,6 @@
                    TextWrapping="Wrap"
                    Foreground="Red"
                    FontSize="12" />
-
         <Button Margin="0 10 0 5"
                 Content="Sign up"
                 x:Name="SignUpButton" />
diff --git a/XamlNameReferenceGenerator.Sandbox/SignUpView.xaml.cs b/src/XamlNameReferenceGenerator.Sandbox/SignUpView.xaml.cs
similarity index 100%
rename from XamlNameReferenceGenerator.Sandbox/SignUpView.xaml.cs
rename to src/XamlNameReferenceGenerator.Sandbox/SignUpView.xaml.cs
diff --git a/XamlNameReferenceGenerator.Sandbox/XamlNameReferenceGenerator.Sandbox.csproj b/src/XamlNameReferenceGenerator.Sandbox/XamlNameReferenceGenerator.Sandbox.csproj
similarity index 89%
rename from XamlNameReferenceGenerator.Sandbox/XamlNameReferenceGenerator.Sandbox.csproj
rename to src/XamlNameReferenceGenerator.Sandbox/XamlNameReferenceGenerator.Sandbox.csproj
index 4b93917903..3a0161fe8f 100644
--- a/XamlNameReferenceGenerator.Sandbox/XamlNameReferenceGenerator.Sandbox.csproj
+++ b/src/XamlNameReferenceGenerator.Sandbox/XamlNameReferenceGenerator.Sandbox.csproj
@@ -5,9 +5,9 @@
         <LangVersion>preview</LangVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.9.10" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.9.10" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.10" />
+        <PackageReference Include="Avalonia" Version="0.10.0-preview5" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-preview5" />
         <PackageReference Include="Citrus.Avalonia" Version="1.2.6" />
     </ItemGroup>
     <ItemGroup>
diff --git a/XamlNameReferenceGenerator.sln b/src/XamlNameReferenceGenerator.sln
similarity index 100%
rename from XamlNameReferenceGenerator.sln
rename to src/XamlNameReferenceGenerator.sln
diff --git a/XamlNameReferenceGenerator/NameReferenceDebugger.cs b/src/XamlNameReferenceGenerator/NameReferenceDebugger.cs
similarity index 100%
rename from XamlNameReferenceGenerator/NameReferenceDebugger.cs
rename to src/XamlNameReferenceGenerator/NameReferenceDebugger.cs
diff --git a/XamlNameReferenceGenerator/NameReferenceGenerator.cs b/src/XamlNameReferenceGenerator/NameReferenceGenerator.cs
similarity index 96%
rename from XamlNameReferenceGenerator/NameReferenceGenerator.cs
rename to src/XamlNameReferenceGenerator/NameReferenceGenerator.cs
index 69d5dd3677..1a75ec296b 100644
--- a/XamlNameReferenceGenerator/NameReferenceGenerator.cs
+++ b/src/XamlNameReferenceGenerator/NameReferenceGenerator.cs
@@ -4,6 +4,7 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 using System.Text;
 using Microsoft.CodeAnalysis.CSharp;
+using XamlNameReferenceGenerator.Parsers;
 
 namespace XamlNameReferenceGenerator
 {
@@ -28,7 +29,7 @@ namespace XamlNameReferenceGenerator
 }
 ";
         private const string DebugPath = @"C:\Users\prizr\Documents\GitHub\XamlNameReferenceGenerator\debug.txt";
-        private static readonly NameReferenceXamlParser XamlParser = new NameReferenceXamlParser();
+        private static readonly INameReferenceXamlParser XamlParser = new XamlXRawNameReferenceXamlParser();
         private static readonly NameReferenceDebugger Debugger = new NameReferenceDebugger(DebugPath);
         private static readonly SymbolDisplayFormat SymbolDisplayFormat = new SymbolDisplayFormat(
             typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
@@ -70,7 +71,7 @@ namespace XamlNameReferenceGenerator
             var nameSpace = classSymbol.ContainingNamespace.ToDisplayString(SymbolDisplayFormat);
             var namespaces = additionalNamespaces.Select(name => $"using {name};");
             var namedControls = XamlParser
-                .GetNamedControls(xamlFile)
+                .GetNamedControls(xamlFile.GetText()!.ToString())
                 .Select(info => "        " +
                                 $"public {info.TypeName} {info.Name} => " +
                                 $"this.FindControl<{info.TypeName}>(\"{info.Name}\");");
diff --git a/XamlNameReferenceGenerator/NameReferenceSyntaxReceiver.cs b/src/XamlNameReferenceGenerator/NameReferenceSyntaxReceiver.cs
similarity index 100%
rename from XamlNameReferenceGenerator/NameReferenceSyntaxReceiver.cs
rename to src/XamlNameReferenceGenerator/NameReferenceSyntaxReceiver.cs
diff --git a/src/XamlNameReferenceGenerator/Parsers/INameReferenceXamlParser.cs b/src/XamlNameReferenceGenerator/Parsers/INameReferenceXamlParser.cs
new file mode 100644
index 0000000000..a452fb328a
--- /dev/null
+++ b/src/XamlNameReferenceGenerator/Parsers/INameReferenceXamlParser.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace XamlNameReferenceGenerator.Parsers
+{
+    public interface INameReferenceXamlParser
+    {
+        List<(string TypeName, string Name)> GetNamedControls(string xaml);
+    }
+}
\ No newline at end of file
diff --git a/src/XamlNameReferenceGenerator/Parsers/XamlXCompiledNameReferenceXamlParser.cs b/src/XamlNameReferenceGenerator/Parsers/XamlXCompiledNameReferenceXamlParser.cs
new file mode 100644
index 0000000000..dfd75578ba
--- /dev/null
+++ b/src/XamlNameReferenceGenerator/Parsers/XamlXCompiledNameReferenceXamlParser.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace XamlNameReferenceGenerator.Parsers
+{
+    public class XamlXCompiledNameReferenceXamlParser : INameReferenceXamlParser
+    {
+        public List<(string TypeName, string Name)> GetNamedControls(string xaml)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/XamlNameReferenceGenerator/Parsers/XamlXRawNameReferenceXamlParser.cs b/src/XamlNameReferenceGenerator/Parsers/XamlXRawNameReferenceXamlParser.cs
new file mode 100644
index 0000000000..a3909124ab
--- /dev/null
+++ b/src/XamlNameReferenceGenerator/Parsers/XamlXRawNameReferenceXamlParser.cs
@@ -0,0 +1,67 @@
+using System.Collections.Generic;
+using XamlX;
+using XamlX.Ast;
+using XamlX.Parsers;
+
+namespace XamlNameReferenceGenerator.Parsers
+{
+    public class XamlXRawNameReferenceXamlParser : INameReferenceXamlParser
+    {
+        public List<(string TypeName, string Name)> GetNamedControls(string xaml)
+        {
+            var parsed = XDocumentXamlParser.Parse(xaml, new Dictionary<string, string>
+            {
+                {XamlNamespaces.Blend2008, XamlNamespaces.Blend2008}
+            });
+
+            var visitor = new XamlAstCollector();
+            parsed.Root.Visit(visitor);
+            parsed.Root.VisitChildren(visitor);
+            return visitor.Controls;
+        }
+
+        private class XamlAstCollector : IXamlAstVisitor
+        {
+            public List<(string TypeName, string Name)> Controls { get; } = new List<(string TypeName, string Name)>();
+
+            public IXamlAstNode Visit(IXamlAstNode node)
+            {
+                if (node is XamlAstObjectNode element && element.Type is XamlAstXmlTypeReference type)
+                {
+                    foreach (var child in element.Children)
+                    {
+                        var nameValue = ResolveNameDirectiveOrDefault(child);
+                        if (nameValue == null) continue;
+
+                        var typeNamePair = (type.Name, nameValue);
+                        if (!Controls.Contains(typeNamePair))
+                            Controls.Add(typeNamePair);
+                    }
+                }
+
+                return node;
+            }
+
+            public void Push(IXamlAstNode node) { }
+
+            public void Pop() { }
+
+            private static string ResolveNameDirectiveOrDefault(IXamlAstNode node) =>
+                node switch
+                {
+                    XamlAstXamlPropertyValueNode propertyValueNode when
+                        propertyValueNode.Property is XamlAstNamePropertyReference reference &&
+                        reference.Name == "Name" &&
+                        propertyValueNode.Values.Count > 0 &&
+                        propertyValueNode.Values[0] is XamlAstTextNode nameNode => nameNode.Text,
+
+                    XamlAstXmlDirective xmlDirective when
+                        xmlDirective.Name == "Name" &&
+                        xmlDirective.Values.Count > 0 &&
+                        xmlDirective.Values[0] is XamlAstTextNode xNameNode => xNameNode.Text,
+
+                    _ => null
+                };
+        }
+    }
+}
\ No newline at end of file
diff --git a/XamlNameReferenceGenerator/NameReferenceXamlParser.cs b/src/XamlNameReferenceGenerator/Parsers/XmlDocumentNameReferenceXamlParser.cs
similarity index 86%
rename from XamlNameReferenceGenerator/NameReferenceXamlParser.cs
rename to src/XamlNameReferenceGenerator/Parsers/XmlDocumentNameReferenceXamlParser.cs
index 10f5740fbe..db4f2cff7f 100644
--- a/XamlNameReferenceGenerator/NameReferenceXamlParser.cs
+++ b/src/XamlNameReferenceGenerator/Parsers/XmlDocumentNameReferenceXamlParser.cs
@@ -1,15 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Xml;
-using Microsoft.CodeAnalysis;
 
-namespace XamlNameReferenceGenerator
+namespace XamlNameReferenceGenerator.Parsers
 {
-    internal class NameReferenceXamlParser
+    internal class XmlDocumentNameReferenceXamlParser : INameReferenceXamlParser
     {
-        public List<(string TypeName, string Name)> GetNamedControls(AdditionalText additionalText)
+        public List<(string TypeName, string Name)> GetNamedControls(string xaml)
         {
-            var xaml = additionalText.GetText()!.ToString();
             var document = new XmlDocument();
             document.LoadXml(xaml);
 
diff --git a/XamlNameReferenceGenerator/XamlNameReferenceGenerator.csproj b/src/XamlNameReferenceGenerator/XamlNameReferenceGenerator.csproj
similarity index 65%
rename from XamlNameReferenceGenerator/XamlNameReferenceGenerator.csproj
rename to src/XamlNameReferenceGenerator/XamlNameReferenceGenerator.csproj
index b6db147a73..6b0736511e 100644
--- a/XamlNameReferenceGenerator/XamlNameReferenceGenerator.csproj
+++ b/src/XamlNameReferenceGenerator/XamlNameReferenceGenerator.csproj
@@ -4,10 +4,11 @@
         <LangVersion>preview</LangVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.9.10" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.9.10" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.10" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-3.final" PrivateAssets="all" />
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.0.0" PrivateAssets="all" />
     </ItemGroup>
+    <ItemGroup>
+        <Compile Link="XamlX\filename" Include="../../external/XamlX/src/XamlX/**/*.cs" />
+        <Compile Remove="../../external/XamlX/src/XamlX/**/SreTypeSystem.cs" />
+    </ItemGroup>
 </Project>
\ No newline at end of file