diff --git a/Melskin/Controls/Button.xaml b/Melskin/Controls/Button.xaml
index cdfe1fb..8f67c8f 100644
--- a/Melskin/Controls/Button.xaml
+++ b/Melskin/Controls/Button.xaml
@@ -561,6 +561,7 @@
 
                             <ContentPresenter
                                 x:Name="Icon"
+                                Margin="0,0,5,0"
                                 Content="{Binding Path=(assists:ControlAssist.Icon), RelativeSource={RelativeSource TemplatedParent}}"
                                 DockPanel.Dock="{Binding Path=(assists:ControlAssist.IconPlacement), RelativeSource={RelativeSource TemplatedParent}}"
                                 Focusable="False"
diff --git a/MelskinTest/MainWindow.xaml b/MelskinTest/MainWindow.xaml
index 62af0a2..fd60077 100644
--- a/MelskinTest/MainWindow.xaml
+++ b/MelskinTest/MainWindow.xaml
@@ -347,7 +347,11 @@
                                 Content="主要"
                                 IsEnabled="{Binding ElementName=CBIsEnabledButton, Path=IsChecked, Converter={x:Static ms:InvertBooleanConverter.Instance}}"
                                 ToolTip="Primary"
-                                ToolTipService.Placement="Top" />
+                                ToolTipService.Placement="Top">
+                                <!--<ms:ControlAssist.Icon>
+                                    <ms:IconElement FontFamily="{StaticResource BoxIcons}" Glyph="&#xEADF;" />
+                                </ms:ControlAssist.Icon>-->
+                            </Button>
                             <Button
                                 ms:ControlAssist.AppearanceType="Info"
                                 Content="信息"
diff --git a/ShrlAlgo.Addin.Test/ActionWindow.xaml.cs b/ShrlAlgo.Addin.Test/ActionWindow.xaml.cs
index 515b840..1199f32 100644
--- a/ShrlAlgo.Addin.Test/ActionWindow.xaml.cs
+++ b/ShrlAlgo.Addin.Test/ActionWindow.xaml.cs
@@ -18,7 +18,7 @@ using Microsoft.Win32;
 using Nice3point.Revit.Toolkit.External.Handlers;
 
 using OfficeOpenXml;
-using ShrlAlgoToolkit.Revit.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 
 namespace ShrlAlgo.Addin.Test;
 
diff --git a/ShrlAlgo.Addin.Test/AddWallTypeParam.cs b/ShrlAlgo.Addin.Test/AddWallTypeParam.cs
index 4788eb1..6ae3d4b 100644
--- a/ShrlAlgo.Addin.Test/AddWallTypeParam.cs
+++ b/ShrlAlgo.Addin.Test/AddWallTypeParam.cs
@@ -4,7 +4,7 @@ using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Selection;
 
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.Revit.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 using ShrlAlgoToolkit.Revit.Extensions;
 
 
diff --git a/ShrlAlgo.Addin.Test/CADCurveToModelCurveCmd.cs b/ShrlAlgo.Addin.Test/CADCurveToModelCurveCmd.cs
index 46a9f64..95d1781 100644
--- a/ShrlAlgo.Addin.Test/CADCurveToModelCurveCmd.cs
+++ b/ShrlAlgo.Addin.Test/CADCurveToModelCurveCmd.cs
@@ -7,7 +7,7 @@ using Autodesk.Revit.UI.Selection;
 
 using Nice3point.Revit.Toolkit.External;
 
-using ShrlAlgoToolkit.Revit.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 using ShrlAlgoToolkit.Revit.Extensions;
 
 namespace ShrlAlgo.Addin.Test;
diff --git a/ShrlAlgo.Addin.Test/FluentAddin.cs b/ShrlAlgo.Addin.Test/FluentAddin.cs
index 53f62f3..9c3915b 100644
--- a/ShrlAlgo.Addin.Test/FluentAddin.cs
+++ b/ShrlAlgo.Addin.Test/FluentAddin.cs
@@ -12,7 +12,7 @@ using Autodesk.Revit.DB;
 using Nice3point.Revit.Toolkit.External;
 using Nice3point.Revit.Toolkit.Utils;
 
-using ShrlAlgoToolkit.Revit.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 using ShrlAlgoToolkit.Revit.Extensions;
 
 namespace ShrlAlgo.Addin.Test;
diff --git a/ShrlAlgo.Addin.Test/PlaceInstanceByCircleCmd.cs b/ShrlAlgo.Addin.Test/PlaceInstanceByCircleCmd.cs
index 65e9a1d..8b8e35c 100644
--- a/ShrlAlgo.Addin.Test/PlaceInstanceByCircleCmd.cs
+++ b/ShrlAlgo.Addin.Test/PlaceInstanceByCircleCmd.cs
@@ -7,7 +7,7 @@ using Autodesk.Revit.UI.Selection;
 
 using Nice3point.Revit.Toolkit.External;
 
-using ShrlAlgoToolkit.Revit.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 using ShrlAlgoToolkit.Revit.Extensions;
 
 namespace ShrlAlgo.Addin.Test;
diff --git a/ShrlAlgo.Addin.Test/RevitAddin.cs b/ShrlAlgo.Addin.Test/RevitAddin.cs
index c2264b4..48c9ea6 100644
--- a/ShrlAlgo.Addin.Test/RevitAddin.cs
+++ b/ShrlAlgo.Addin.Test/RevitAddin.cs
@@ -9,7 +9,7 @@ using Autodesk.Revit.UI.Selection;
 using Nice3point.Revit.Toolkit.External;
 
 using ShrlAlgoToolkit.Core.Assists;
-using ShrlAlgoToolkit.Revit.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 using ShrlAlgoToolkit.Revit.Extensions;
 
 
diff --git a/ShrlAlgo.Addin.Test/ShrlAlgo.Addin.Test.csproj b/ShrlAlgo.Addin.Test/ShrlAlgo.Addin.Test.csproj
index dd9ffe1..b79ef38 100644
--- a/ShrlAlgo.Addin.Test/ShrlAlgo.Addin.Test.csproj
+++ b/ShrlAlgo.Addin.Test/ShrlAlgo.Addin.Test.csproj
@@ -50,5 +50,5 @@
 		<PackageReference Include="EPPlus.Core.Extensions" Version="2.4.0" />
 		<PackageReference Include="Nice3point.Revit.Toolkit" Version="2019.*" PrivateAssets="All" />
 	</ItemGroup>
-	<Import Project="..\ShrlAlgoToolkit.Revit\ShrlAlgoToolkit.Revit.projitems" Label="Shared" />
+	<Import Project="..\ShrlAlgoToolkit.RevitCore\ShrlAlgoToolkit.RevitCore.projitems" Label="Shared" />
 </Project>
\ No newline at end of file
diff --git a/ShrlAlgo.Addin.Test/TempCmd.cs b/ShrlAlgo.Addin.Test/TempCmd.cs
index 9288509..6d19c63 100644
--- a/ShrlAlgo.Addin.Test/TempCmd.cs
+++ b/ShrlAlgo.Addin.Test/TempCmd.cs
@@ -9,7 +9,7 @@ using Autodesk.Revit.UI.Selection;
 
 using Nice3point.Revit.Toolkit.External;
 
-using ShrlAlgoToolkit.Revit.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 using ShrlAlgoToolkit.Revit.Extensions;
 
 
@@ -72,13 +72,6 @@ public class TempCmd : ExternalCommand
             }
         }
         return;
-        var refer = UiDocument.Selection.PickObject(Autodesk.Revit.UI.Selection.ObjectType.Element);
-        var element = Document.GetElement(refer);
-        Document.Invoke(
-            _ =>
-            {
-                ElementTransformUtils.MoveElement(Document, element.Id, XYZ.BasisY * 200 / 304.8);
-            });
 #if false
         var geo = element.get_Geometry(new Options() { ComputeReferences = true, DetailLevel = ViewDetailLevel.Fine });
         if (Document.IsFamilyDocument)
diff --git a/ShrlAlgoToolkit.RevitAddins/Assists/EPPlusHelper.cs b/ShrlAlgoToolkit.RevitAddins/Assists/EPPlusHelper.cs
deleted file mode 100644
index 54993a6..0000000
--- a/ShrlAlgoToolkit.RevitAddins/Assists/EPPlusHelper.cs
+++ /dev/null
@@ -1,361 +0,0 @@
-using System.Data;
-using System.IO;
-using System.Reflection;
-
-using EPPlus.Core.Extensions;
-
-using OfficeOpenXml;
-using OfficeOpenXml.Style;
-
-namespace ShrlAlgoToolkit.RevitAddins.Assists;
-
-public class EPPlusHelper //公式计算最后需要调用Calculate()
-{
-    /// <summary>
-    ///     DataTable导出为Excel
-    /// </summary>
-    /// <param name="destFileName"></param>
-    /// <param name="dt"></param>
-    public static void DataTableToExcel(DataTable dt, string destFileName)
-    {
-        FileInfo fi = new(destFileName);
-        using ExcelPackage package = new(fi);
-        try
-        {
-            var workSheet = package.Workbook.Worksheets.Add(dt.TableName);
-            workSheet.Cells["A1"].LoadFromDataTable(dt, true);
-        }
-        catch (Exception)
-        {
-            // ignored
-        }
-        finally
-        {
-            package.Save();
-        }
-    }
-    public List<T> ReadExcel<T>(string path, int worksheetIndex) where T : class, new()
-    {
-        FileInfo fi = new(path);
-        using ExcelPackage package = new(fi);
-        var worksheet = package.Workbook.Worksheets[worksheetIndex];
-        ////获取worksheet的行数
-        //int rows = worksheet            .Dimension.End.Row;
-        ////获取worksheet的列数
-        //int cols = worksheet            .Dimension.End.Column;
-        //worksheet.TrimLastEmptyRows();
-        AppDomain.CurrentDomain.AssemblyResolve += CurrentDomainOnAssemblyResolve;
-        try
-        {
-            return package.ToList<T>(worksheetIndex, configuration => configuration.SkipCastingErrors());
-        }
-        catch (EPPlus.Core.Extensions.Exceptions.ExcelValidationException)
-        {
-            System.Windows.MessageBox.Show("列名不存在或不匹配或检查表头是否存在换行。");
-        }
-        finally
-        {
-            AppDomain.CurrentDomain.AssemblyResolve -= CurrentDomainOnAssemblyResolve;
-        }
-        return null;
-    }
-
-    private static Assembly CurrentDomainOnAssemblyResolve(object sender, ResolveEventArgs args)
-    {
-        if (!args.Name.Contains("ComponentModel.Annotations"))
-        {
-            return null;
-        }
-
-        var assemblyFile = Path.Combine(
-            Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
-            "System.ComponentModel.Annotations.dll"
-        );
-        return File.Exists(assemblyFile) ? Assembly.LoadFrom(assemblyFile) : null;
-    }
-    /// <summary>
-    ///     给第一个表中的单元格赋值
-    /// </summary>
-    /// <param name="fileName"></param>
-    /// <param name="rowNum"></param>
-    /// <param name="columnNum"></param>
-    /// <param name="value"></param>
-    public static void EditCellValue(string fileName, int rowNum, int columnNum, string value)
-    {
-        FileInfo fi = new(fileName);
-        using ExcelPackage package = new(fi);
-        //ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
-        var sheet = package.Workbook.Worksheets[0];
-        //string filename = System.IO.Path.GetFileNameWithoutExtension(fileName);
-        sheet.Cells[rowNum, columnNum].Value = value;
-        package.Save();
-    }
-
-    /// <summary>
-    ///     工作表转换为DataTable,首行为表头
-    /// </summary>
-    /// <param name="worksheet">行列索引从1开始</param>
-    /// <returns></returns>
-    public static DataTable ExcelSheetToDataTable(ExcelWorksheet worksheet)
-    {
-        if (worksheet == null)
-        {
-            return null;
-        }
-
-        //获取worksheet的行数
-        var rows = worksheet.Dimension.End.Row;
-        //获取worksheet的列数
-        var cols = worksheet.Dimension.End.Column;
-
-        DataTable dt = new(worksheet.Name);
-        DataRow dr = null;
-        for (var i = 1; i <= rows; i++)
-        {
-            if (i > 1)
-            {
-                dr = dt.Rows.Add();
-            }
-
-            for (var j = 1; j <= cols; j++)
-            {
-                //默认将第一行设置为datatable的标题
-                var value = worksheet.Cells[i, j].Value;
-                if (i == 1)
-                {
-                    dt.Columns.Add(value == null ? $"标题{i}" : value.ToString());
-                }
-                //剩下的写入datatable
-                else
-                {
-                    dr[j - 1] = value == null ? string.Empty : value.ToString();
-                }
-            }
-        }
-
-        return dt;
-    }
-
-    /// <summary>
-    ///     工作表转换为DataTable
-    /// </summary>
-    /// <param name="fileName"></param>
-    /// <param name="sheetName"></param>
-    /// <returns></returns>
-    public static DataTable ExcelSheetToDataTable(string fileName, string sheetName)
-    {
-        FileInfo fi = new(fileName);
-        ExcelPackage p = new(fi);
-        var workbook = p.Workbook;
-        var worksheet = workbook.Worksheets[sheetName];
-        return ExcelSheetToDataTable(worksheet);
-    }
-
-    /// <summary>
-    /// 获取工作表
-    /// </summary>
-    /// <param name="excelFilePath"></param>
-    /// <param name="sheetName"></param>
-    /// <returns></returns>
-    /// <exception cref="Exception"></exception>
-    public static ExcelWorksheet GetExcelWorksheet(string excelFilePath, string sheetName)
-    {
-        var excelworkbook = new FileInfo(excelFilePath);
-        using var p = new ExcelPackage(excelworkbook);
-        var ws = p.Workbook.Worksheets[sheetName];
-        return ws ?? throw new Exception("工作表不存在。");
-    }
-
-    /// <summary>
-    ///     读取Excel所有表
-    /// </summary>
-    /// <param name="filePath"></param>
-    public void ReadExcel(string filePath)
-    {
-        using ExcelPackage package = new(new FileStream(filePath, FileMode.Open));
-        for (var i = 1; i <= package.Workbook.Worksheets.Count; ++i)
-        {
-            var sheet = package.Workbook.Worksheets[i];
-            for (int j = sheet.Dimension.Start.Column, k = sheet.Dimension.End.Column; j <= k; j++)
-            {
-                for (int m = sheet.Dimension.Start.Row, n = sheet.Dimension.End.Row; m <= n; m++)
-                {
-                    //string str = GetValue(sheet, m, j);
-                    //if (str != null)
-                    //{
-                    //    // do something
-                    //}
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    /// 设置单元格的值
-    /// </summary>
-    /// <param name="sheet"></param>
-    /// <param name="rowNum">1开始</param>
-    /// <param name="columnNum">1开始</param>
-    /// <param name="value"></param>
-    public static void SetCellValue(ExcelWorksheet sheet, int rowNum, int columnNum, string value)
-    {
-        //sheet.Cells[rowNum, ColumnNum].Value = value;
-        sheet.SetValue(rowNum, columnNum, value);
-    }
-
-    /// <summary>
-    /// 通过单元格名设置值
-    /// </summary>
-    /// <param name="sheet"></param>
-    /// <param name="cellName"></param>
-    /// <param name="value"></param>
-    public static void SetCellValue(ExcelWorksheet sheet, string cellName, string value)
-    {
-        sheet.Cells[cellName].Value = value;
-    }
-
-    /// <summary>
-    ///     给工作表中的单元格赋值
-    /// </summary>
-    /// <param name="fileName"></param>
-    /// <param name="sheetname"></param>
-    /// <param name="rowNum"></param>
-    /// <param name="columnNum"></param>
-    /// <param name="value"></param>
-    public static void SetCellValue(string fileName, string sheetname, int rowNum, int columnNum, string value)
-    {
-        FileInfo fi = new(fileName);
-        using ExcelPackage package = new(fi);
-        //ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
-        var sheet = package.Workbook.Worksheets[sheetname];
-        //string filename = System.IO.Path.GetFileNameWithoutExtension(fileName);
-        sheet.SetValue(rowNum, columnNum, value);
-        package.Save();
-    }
-
-    /// <summary>
-    ///     给工作表中的单元格赋值
-    /// </summary>
-    /// <param name="fileName"></param>
-    /// <param name="sheetname"></param>
-    /// <param name="cellName">单元格名称，比如A1</param>
-    /// <param name="value"></param>
-    public static void SetCellValue(string fileName, string sheetname, string cellName, string value)
-    {
-        FileInfo fi = new(fileName);
-        using ExcelPackage package = new(fi);
-        //ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
-        var sheet = package.Workbook.Worksheets[sheetname];
-        //string filename = System.IO.Path.GetFileNameWithoutExtension(fileName);
-        sheet.Cells[cellName].Value = value;
-        package.Save();
-    }
-
-    /// <summary>
-    ///     给工作表中的单元格赋值
-    /// </summary>
-    /// <param name="fileName"></param>
-    /// <param name="index">表索引，0开始</param>
-    /// <param name="cellName">单元格名称，如A1</param>
-    /// <param name="value"></param>
-    public static void SetCellValue(string fileName, int index, string cellName, string value)
-    {
-        FileInfo fi = new(fileName);
-        using ExcelPackage package = new(fi);
-        //ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
-        var sheet = package.Workbook.Worksheets[index];
-        //string filename = System.IO.Path.GetFileNameWithoutExtension(fileName);
-        sheet.Cells[cellName].Value = value;
-        package.Save();
-    }
-
-    /// <summary>
-    /// 设置样式
-    /// </summary>
-    /// <param name="sheet"></param>
-    /// <param name="fromRow"></param>
-    /// <param name="fromCol"></param>
-    /// <param name="toRow"></param>
-    /// <param name="toCol"></param>
-    public static void SetStyle(ExcelWorksheet sheet, int fromRow, int fromCol, int toRow, int toCol)
-    {
-        using var range = sheet.Cells[fromRow, fromCol, toRow, toCol];
-        //range.Style.Font.Name = "微软雅黑";
-        range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
-        range.Style.Font.Size = 12;
-        range.Style.Border.Top.Style = ExcelBorderStyle.Thin;
-        range.Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
-        range.Style.Border.Left.Style = ExcelBorderStyle.Thin;
-        range.Style.Border.Right.Style = ExcelBorderStyle.Thin;
-        //range.Style.SetBackgroundColor(System.Drawing.SelectedColor.FromArgb(142, 169, 219));
-    }
-
-    /// <summary>
-    /// 设置表头样式
-    /// </summary>
-    /// <param name="sheet"></param>
-    /// <param name="fromRow"></param>
-    /// <param name="fromCol"></param>
-    /// <param name="toRow"></param>
-    /// <param name="toCol"></param>
-    public static void SetTitle(ExcelWorksheet sheet, int fromRow, int fromCol, int toRow, int toCol)
-    {
-        using var range = sheet.Cells[fromRow, fromCol, toRow, toCol];
-        range.Style.Font.Name = "微软雅黑";
-        range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
-        range.Style.Font.Size = 14;
-        range.Style.Font.Bold = true;
-        range.Style.Border.Top.Style = ExcelBorderStyle.Thin;
-        range.Style.Border.Bottom.Style = ExcelBorderStyle.Thin;
-        range.Style.Border.Left.Style = ExcelBorderStyle.Thin;
-        range.Style.Border.Right.Style = ExcelBorderStyle.Thin;
-        //range.SetBackgroundColor(System.Drawing.SelectedColor.FromArgb(142, 169, 219));
-    }
-
-    /// <summary>
-    ///     创建Excel文件添加Excel表格
-    /// </summary>
-    /// <param name="filePath"></param>
-    /// <param name="sheetName"></param>
-    /// <param name="action"></param>
-    public static void WriteExcel(string filePath, string sheetName, Action<ExcelPackage> action)
-    {
-        using ExcelPackage package = new();
-        var sheet = package.Workbook.Worksheets.Add(sheetName);
-
-        using Stream stream = new FileStream(filePath, FileMode.Create);
-        action(package);
-        package.SaveAs(stream);
-    }
-
-    /// <summary>
-    /// 写入Excel
-    /// </summary>
-    /// <param name="filePath"></param>
-    /// <param name="action"></param>
-    public static void WriteExcel(string filePath, Action<ExcelPackage> action)
-    {
-        var fileInfo = new FileInfo(filePath);
-        if (fileInfo.Exists)
-        {
-            try
-            {
-                fileInfo.Delete();
-            }
-            catch (IOException)
-            {
-                throw new IOException("文件正在使用");
-            }
-            using ExcelPackage package = new(fileInfo);
-            action(package);
-            package.Save();
-        }
-        else
-        {
-            using ExcelPackage package = new(fileInfo);
-            action(package);
-            package.Save();
-            //throw new ArgumentNullException();
-        }
-    }
-}
diff --git a/ShrlAlgoToolkit.RevitAddins/Assists/DWGAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/DWGAssist.cs
similarity index 97%
rename from ShrlAlgoToolkit.RevitAddins/Assists/DWGAssist.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Assists/DWGAssist.cs
index 0e778e3..d8820b4 100644
--- a/ShrlAlgoToolkit.RevitAddins/Assists/DWGAssist.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/DWGAssist.cs
@@ -3,8 +3,11 @@ using ACadSharp.Entities;
 
 using Autodesk.Revit.DB;
 
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
 
-namespace ShrlAlgoToolkit.RevitAddins.Assists;
+namespace ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 public static class DWGAssist
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/Assists/ImageAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/ImageAssist.cs
similarity index 98%
rename from ShrlAlgoToolkit.RevitAddins/Assists/ImageAssist.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Assists/ImageAssist.cs
index e56ab7a..4051ce3 100644
--- a/ShrlAlgoToolkit.RevitAddins/Assists/ImageAssist.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/ImageAssist.cs
@@ -8,7 +8,7 @@ using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace ShrlAlgoToolkit.RevitAddins.Assists;
+namespace ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 public static class ImageAssist
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/Assists/LogAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/LogAssist.cs
similarity index 96%
rename from ShrlAlgoToolkit.RevitAddins/Assists/LogAssist.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Assists/LogAssist.cs
index d2405c4..c84402a 100644
--- a/ShrlAlgoToolkit.RevitAddins/Assists/LogAssist.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/LogAssist.cs
@@ -2,7 +2,11 @@
 using System.IO;
 using System.Text;
 
-namespace ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 public static class LogAssist
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/Assists/SingletonViewAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/SingletonViewAssist.cs
similarity index 81%
rename from ShrlAlgoToolkit.RevitAddins/Assists/SingletonViewAssist.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Assists/SingletonViewAssist.cs
index 6c325ca..57041c1 100644
--- a/ShrlAlgoToolkit.RevitAddins/Assists/SingletonViewAssist.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/SingletonViewAssist.cs
@@ -1,6 +1,10 @@
 using System.Windows;
 
-namespace ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 public sealed record SingletonViewAssist<T>
     where T : Window, new()
diff --git a/ShrlAlgoToolkit.RevitAddins/Assists/TextSearchAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/TextSearchAssist.cs
similarity index 81%
rename from ShrlAlgoToolkit.RevitAddins/Assists/TextSearchAssist.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Assists/TextSearchAssist.cs
index db27715..ca856b4 100644
--- a/ShrlAlgoToolkit.RevitAddins/Assists/TextSearchAssist.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/TextSearchAssist.cs
@@ -1,16 +1,20 @@
 using System.Windows;
 
-namespace ShrlAlgoToolkit.RevitAddins.Assists
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Assists
 {
     public class TextSearchAssist
     {
         // Using a DependencyProperty as the backing store for IsTextMatch.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty IsTextMatchProperty =
-            DependencyProperty.RegisterAttached("IsTextMatch", typeof(bool), typeof(TextSearchAssist), new UIPropertyMetadata(false));
+            DependencyProperty.RegisterAttached("IsTextMatch", typeof(bool), typeof(Assists.TextSearchAssist), new UIPropertyMetadata(false));
 
         // Using a DependencyProperty as the backing store for SearchValue.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty SearchValueProperty =
-            DependencyProperty.RegisterAttached("SearchValue", typeof(string), typeof(TextSearchAssist),
+            DependencyProperty.RegisterAttached("SearchValue", typeof(string), typeof(Assists.TextSearchAssist),
                 new FrameworkPropertyMetadata(string.Empty, FrameworkPropertyMetadataOptions.Inherits));
 
         public static bool GetIsTextMatch(DependencyObject obj)
diff --git a/ShrlAlgoToolkit.RevitAddins/Assists/ThumbnailOptions.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/ThumbnailOptions.cs
similarity index 50%
rename from ShrlAlgoToolkit.RevitAddins/Assists/ThumbnailOptions.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Assists/ThumbnailOptions.cs
index 3b2db9b..2f61da9 100644
--- a/ShrlAlgoToolkit.RevitAddins/Assists/ThumbnailOptions.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/ThumbnailOptions.cs
@@ -1,4 +1,8 @@
-namespace ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 public enum ThumbnailOptions
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/Assists/ValidatorAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/ValidatorAssist.cs
similarity index 98%
rename from ShrlAlgoToolkit.RevitAddins/Assists/ValidatorAssist.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Assists/ValidatorAssist.cs
index c0781d4..e64c13d 100644
--- a/ShrlAlgoToolkit.RevitAddins/Assists/ValidatorAssist.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/ValidatorAssist.cs
@@ -2,7 +2,11 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 /// <summary>
 ///     各种验证帮助类
diff --git a/ShrlAlgoToolkit.RevitAddins/Assists/WinDialogAssist.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/WinDialogAssist.cs
similarity index 87%
rename from ShrlAlgoToolkit.RevitAddins/Assists/WinDialogAssist.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Assists/WinDialogAssist.cs
index 902d3a7..5810b47 100644
--- a/ShrlAlgoToolkit.RevitAddins/Assists/WinDialogAssist.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/WinDialogAssist.cs
@@ -11,7 +11,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 using Microsoft.Win32;
 
-namespace ShrlAlgoToolkit.RevitAddins.Assists;
+namespace ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 public static class WinDialogAssist
 {
@@ -78,18 +78,17 @@ public static class WinDialogAssist
     {
         if (string.IsNullOrEmpty(fileFullName))
             throw new ArgumentNullException(nameof(fileFullName));
-        fileFullName = Path.GetFullPath(fileFullName);
-        var pidlList = ILCreateFromPathW(fileFullName);
-        if (pidlList == IntPtr.Zero) return;
-        try
+        if (!File.Exists(fileFullName))
         {
-            Marshal.ThrowExceptionForHR(SHOpenFolderAndSelectItems(pidlList, 0, IntPtr.Zero, 0));
-        }
-        finally
-        {
-            ILFree(pidlList);
+            throw new FileNotFoundException("指定的文件不存在", fileFullName);
         }
+        var proc = new System.Diagnostics.Process();
+        proc.StartInfo.FileName = "explorer";
+        //打开资源管理器
+        proc.StartInfo.Arguments = "/select," + fileFullName;
+        proc.Start();
     }
+
     /// <summary>
     /// 新建一个资源管理器窗口并选中文件或文件夹
     /// </summary>
@@ -200,41 +199,8 @@ public static class WinDialogAssist
         }
         view.Activate();
         AppDomain.CurrentDomain.AssemblyResolve -= CurrentDomain_AssemblyResolve;
-
-        //AssemblyLoaderHelpers loaderUtil = new(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
-        //loaderUtil.HookAssemblyResolve();
-        //try
-        //{
-        //	var view = SingletonViewAssist<Command>.GetInstance(out var isNewCreate);
-        //	if (isNewCreate)
-        //	{
-        //		view.DataContext = viewModel;
-        //		view.ShowAhead();
-        //	}
-        //	view.Activate();
-        //}
-        //catch (Exception ex)
-        //{
-        //	LogAssist.ToLog($"{ex.Source}:{ex.StackTrace}");
-        //}
-        //finally
-        //{
-        //	loaderUtil.UnhookAssemblyResolve();
-        //}
     }
-    //private static Assembly CurrentDomainOnAssemblyResolve(object sender, ResolveEventArgs args)
-    //{
-    //    if (!args.Name.Contains("Xaml.Behaviors"))
-    //    {
-    //        return null;
-    //    }
-
-    //    var assemblyFile = Path.Combine(
-    //        Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
-    //        "Microsoft.Xaml.Behaviors.dll"
-    //    );
-    //    return File.Exists(assemblyFile) ? Assembly.LoadFrom(assemblyFile) : null;
-    //}
+    
     private static Dictionary<Type, Window> _windows = [];
     public static void ShowOrActivate<TWindow, TViewModel>(params object[] viewModelParams)
             where TWindow : Window, new()
diff --git a/ShrlAlgoToolkit.RevitAddins/Assists/WindowsThumbnailProvider.cs b/ShrlAlgoToolkit.RevitAddins/Common/Assists/WindowsThumbnailProvider.cs
similarity index 93%
rename from ShrlAlgoToolkit.RevitAddins/Assists/WindowsThumbnailProvider.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Assists/WindowsThumbnailProvider.cs
index 3eb8d4b..fbc449c 100644
--- a/ShrlAlgoToolkit.RevitAddins/Assists/WindowsThumbnailProvider.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Assists/WindowsThumbnailProvider.cs
@@ -3,7 +3,11 @@ using System.Drawing.Imaging;
 using System.IO;
 using System.Runtime.InteropServices;
 
-namespace ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 /// <summary>
 ///     获取Windows缩略图
@@ -54,7 +58,7 @@ public class WindowsThumbnailProvider
 		return Image.GetPixelFormatSize(bmp.PixelFormat) < 32 ? bmp : CreateAlphaBitmap(bmp, PixelFormat.Format32bppArgb);
 	}
 
-	public static Bitmap GetThumbnail(string fileName, int width, int height, ThumbnailOptions options)
+	public static Bitmap GetThumbnail(string fileName, int width, int height, Assists.ThumbnailOptions options)
 	{
 		var hBitmap = GetHBitmap(Path.GetFullPath(fileName), width, height, options);
 
@@ -83,7 +87,7 @@ public class WindowsThumbnailProvider
 		[MarshalAs(UnmanagedType.Interface)] out Assists.WindowsThumbnailProvider.IShellItem shellItem
 	);
 
-	private static IntPtr GetHBitmap(string fileName, int width, int height, ThumbnailOptions options)
+	private static IntPtr GetHBitmap(string fileName, int width, int height, Assists.ThumbnailOptions options)
 	{
 		var shellItem2Guid = new Guid(ShellItem2Guid);
 		var retCode = SHCreateItemFromParsingName(fileName, IntPtr.Zero, ref shellItem2Guid, out var nativeShellItem);
@@ -141,7 +145,7 @@ public class WindowsThumbnailProvider
 	internal interface IShellItemImageFactory
 	{
 		[PreserveSig]
-        Assists.WindowsThumbnailProvider.HResult GetImage([In] [MarshalAs(UnmanagedType.Struct)] Assists.WindowsThumbnailProvider.NativeSize size, [In] ThumbnailOptions flags, [Out] out IntPtr phbm);
+        Assists.WindowsThumbnailProvider.HResult GetImage([In] [MarshalAs(UnmanagedType.Struct)] Assists.WindowsThumbnailProvider.NativeSize size, [In] Assists.ThumbnailOptions flags, [Out] out IntPtr phbm);
 	}
 
 	[StructLayout(LayoutKind.Sequential)]
diff --git a/ShrlAlgoToolkit.RevitAddins/Attributes/GreaterThanAttribute.cs b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/GreaterThanAttribute.cs
similarity index 81%
rename from ShrlAlgoToolkit.RevitAddins/Attributes/GreaterThanAttribute.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Attributes/GreaterThanAttribute.cs
index 060292a..d06c588 100644
--- a/ShrlAlgoToolkit.RevitAddins/Attributes/GreaterThanAttribute.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/GreaterThanAttribute.cs
@@ -1,6 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace ShrlAlgoToolkit.RevitAddins.Attributes;
+using ShrlAlgoToolkit.RevitAddins.Common.Attributes;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Attributes;
 
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
 public sealed class GreaterThanAttribute : ValidationAttribute
diff --git a/ShrlAlgoToolkit.RevitAddins/Attributes/IsNumericAttribute.cs b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/IsNumericAttribute.cs
similarity index 92%
rename from ShrlAlgoToolkit.RevitAddins/Attributes/IsNumericAttribute.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Attributes/IsNumericAttribute.cs
index 55bcaff..2bed160 100644
--- a/ShrlAlgoToolkit.RevitAddins/Attributes/IsNumericAttribute.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/IsNumericAttribute.cs
@@ -1,7 +1,8 @@
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 
-namespace ShrlAlgoToolkit.RevitAddins.Attributes;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Attributes;
 
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
 public sealed class IsNumericAttribute : ValidationAttribute
diff --git a/ShrlAlgoToolkit.RevitAddins/Attributes/MaximumAttribute.cs b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/MaximumAttribute.cs
similarity index 77%
rename from ShrlAlgoToolkit.RevitAddins/Attributes/MaximumAttribute.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Attributes/MaximumAttribute.cs
index b088f1e..b8d1d16 100644
--- a/ShrlAlgoToolkit.RevitAddins/Attributes/MaximumAttribute.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/MaximumAttribute.cs
@@ -1,6 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace ShrlAlgoToolkit.RevitAddins.Attributes;
+using ShrlAlgoToolkit.RevitAddins.Common.Attributes;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Attributes;
 
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
 public sealed class MaximumAttribute : ValidationAttribute
diff --git a/ShrlAlgoToolkit.RevitAddins/Attributes/MinimumAttribute.cs b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/MinimumAttribute.cs
similarity index 78%
rename from ShrlAlgoToolkit.RevitAddins/Attributes/MinimumAttribute.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Attributes/MinimumAttribute.cs
index a66b95b..1a2cbe1 100644
--- a/ShrlAlgoToolkit.RevitAddins/Attributes/MinimumAttribute.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/MinimumAttribute.cs
@@ -1,6 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace ShrlAlgoToolkit.RevitAddins.Attributes;
+using ShrlAlgoToolkit.RevitAddins.Common.Attributes;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Attributes;
 
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
 public sealed class MinimumAttribute : ValidationAttribute
diff --git a/ShrlAlgoToolkit.RevitAddins/Attributes/NotNullOrEmptyAttribute.cs b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/NotNullOrEmptyAttribute.cs
similarity index 74%
rename from ShrlAlgoToolkit.RevitAddins/Attributes/NotNullOrEmptyAttribute.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Attributes/NotNullOrEmptyAttribute.cs
index 45f236e..dbb1ed7 100644
--- a/ShrlAlgoToolkit.RevitAddins/Attributes/NotNullOrEmptyAttribute.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/NotNullOrEmptyAttribute.cs
@@ -1,6 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace ShrlAlgoToolkit.RevitAddins.Attributes;
+using ShrlAlgoToolkit.RevitAddins.Common.Attributes;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Attributes;
 
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
 public sealed class NotNullOrEmptyAttribute : ValidationAttribute
diff --git a/ShrlAlgoToolkit.RevitAddins/Attributes/UndefinedCharAttribute.cs b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/UndefinedCharAttribute.cs
similarity index 85%
rename from ShrlAlgoToolkit.RevitAddins/Attributes/UndefinedCharAttribute.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Attributes/UndefinedCharAttribute.cs
index 2cf4222..9058568 100644
--- a/ShrlAlgoToolkit.RevitAddins/Attributes/UndefinedCharAttribute.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Attributes/UndefinedCharAttribute.cs
@@ -1,6 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace ShrlAlgoToolkit.RevitAddins.Attributes
+using ShrlAlgoToolkit.RevitAddins.Common.Attributes;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Attributes
 {
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
     public class UndefinedCharAttribute : ValidationAttribute
diff --git a/ShrlAlgoToolkit.RevitAddins/CloseOnClickBehaviour.cs b/ShrlAlgoToolkit.RevitAddins/Common/Behaviours/CloseOnClickBehaviour.cs
similarity index 97%
rename from ShrlAlgoToolkit.RevitAddins/CloseOnClickBehaviour.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Behaviours/CloseOnClickBehaviour.cs
index ac15712..a302f8b 100644
--- a/ShrlAlgoToolkit.RevitAddins/CloseOnClickBehaviour.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Behaviours/CloseOnClickBehaviour.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace ShrlAlgoToolkit.Mvvm.Behaviors;
+namespace ShrlAlgoToolkit.RevitAddins.Common.Behavious;
 
 /// <summary>
 /// 关闭窗口
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/BooleanConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/BooleanConverter.cs
similarity index 93%
rename from ShrlAlgoToolkit.RevitAddins/Converters/BooleanConverter.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/BooleanConverter.cs
index 17e8aa5..dee3467 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/BooleanConverter.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/BooleanConverter.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace ShrlAlgoToolkit.RevitAddins.Converters;
+namespace ShrlAlgoToolkit.RevitAddins.UI.Converters;
 
 public class BooleanConverter<T> : IValueConverter
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/BooleanToVisConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/BooleanToVisConverter.cs
new file mode 100644
index 0000000..58c7fb2
--- /dev/null
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/BooleanToVisConverter.cs
@@ -0,0 +1,16 @@
+using System.Windows;
+
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters;
+
+
+public class BooleanToVisConverter : BooleanConverter<Visibility>
+{
+    public BooleanToVisConverter() : base(Visibility.Visible, Visibility.Collapsed)
+    {
+    }
+}
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/ColorToBrushConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/ColorToBrushConverter.cs
similarity index 74%
rename from ShrlAlgoToolkit.RevitAddins/Converters/ColorToBrushConverter.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/ColorToBrushConverter.cs
index d34e7d0..908aa22 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/ColorToBrushConverter.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/ColorToBrushConverter.cs
@@ -2,7 +2,12 @@
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace ShrlAlgoToolkit.RevitAddins.Converters;
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters;
 
 public class ColorToBrushConverter : IValueConverter
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/ComparisonConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/ComparisonConverter.cs
similarity index 88%
rename from ShrlAlgoToolkit.RevitAddins/Converters/ComparisonConverter.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/ComparisonConverter.cs
index 20e3a44..527193a 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/ComparisonConverter.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/ComparisonConverter.cs
@@ -1,7 +1,12 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace ShrlAlgoToolkit.RevitAddins.Converters;
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters;
 
 public class ComparisonConverter : IValueConverter
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/EnumDescriptionExtension.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionExtension.cs
similarity index 79%
rename from ShrlAlgoToolkit.RevitAddins/Converters/EnumDescriptionExtension.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionExtension.cs
index efdbf1a..1a48a79 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/EnumDescriptionExtension.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionExtension.cs
@@ -1,7 +1,12 @@
 using System.ComponentModel;
 using System.Windows.Markup;
 
-namespace ShrlAlgoToolkit.RevitAddins.Converters
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters
 {
     public class EnumDescriptionExtension : MarkupExtension
     {
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/EnumDescriptionTypeConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionTypeConverter.cs
similarity index 85%
rename from ShrlAlgoToolkit.RevitAddins/Converters/EnumDescriptionTypeConverter.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionTypeConverter.cs
index 4692b12..e17cf1c 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/EnumDescriptionTypeConverter.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumDescriptionTypeConverter.cs
@@ -2,7 +2,12 @@
 using System.Globalization;
 using System.Reflection;
 
-namespace ShrlAlgoToolkit.RevitAddins.Converters;
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters;
 
 /// <summary>
 /// 枚举类上加特性[TypeConverter(typeof(EnumDescriptionTypeConverter))]
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/EnumSourceAndConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumSourceAndConverter.cs
similarity index 93%
rename from ShrlAlgoToolkit.RevitAddins/Converters/EnumSourceAndConverter.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumSourceAndConverter.cs
index 2f35d11..c8fb259 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/EnumSourceAndConverter.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/EnumSourceAndConverter.cs
@@ -4,7 +4,12 @@ using System.Globalization;
 using System.Reflection;
 using System.Windows.Data;
 
-namespace ShrlAlgoToolkit.RevitAddins.Converters;
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters;
 
 /// <summary>
 ///     Description（描述特性）的枚举转换同时也是枚举源的集合
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/InvertBooleanConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/InvertBooleanConverter.cs
similarity index 67%
rename from ShrlAlgoToolkit.RevitAddins/Converters/InvertBooleanConverter.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/InvertBooleanConverter.cs
index 6203cdd..32dec75 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/InvertBooleanConverter.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/InvertBooleanConverter.cs
@@ -1,7 +1,12 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace ShrlAlgoToolkit.RevitAddins.Converters;
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters;
 
 public class InvertBooleanConverter : IValueConverter
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Converters/InverterBooleanToVisConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/InverterBooleanToVisConverter.cs
new file mode 100644
index 0000000..1ce08fe
--- /dev/null
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/InverterBooleanToVisConverter.cs
@@ -0,0 +1,16 @@
+using System.Windows;
+
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters;
+
+public class InverterBooleanToVisConverter : BooleanConverter<Visibility>
+{
+    public InverterBooleanToVisConverter() : base(Visibility.Collapsed, Visibility.Visible)
+    {
+    }
+}
+
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/MarkupConverters.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/MarkupConverters.cs
similarity index 92%
rename from ShrlAlgoToolkit.RevitAddins/Converters/MarkupConverters.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/MarkupConverters.cs
index 4090c0b..107905a 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/MarkupConverters.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/MarkupConverters.cs
@@ -3,7 +3,12 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace ShrlAlgo.Toolkit.Wpf.Converters
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters
 {
     [ValueConversion(typeof(bool), typeof(Visibility))]
     public class BoolVisibilityConverter : MarkupExtension, IValueConverter
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/NotNullToVisibilityConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/NotNullToVisibilityConverter.cs
similarity index 94%
rename from ShrlAlgoToolkit.RevitAddins/Converters/NotNullToVisibilityConverter.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/NotNullToVisibilityConverter.cs
index d8cd42c..10e9121 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/NotNullToVisibilityConverter.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/NotNullToVisibilityConverter.cs
@@ -1,8 +1,10 @@
 using System.Globalization;
 using System.Windows;
+
 using System.Windows.Data;
 
-namespace ShrlAlgoToolkit.RevitAddins.Converters
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters
 {
     /// <summary>
     /// Converts null or not null to a <see cref="Visibility" />.
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/Rv2WinColorConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/Rv2WinColorConverter.cs
similarity index 74%
rename from ShrlAlgoToolkit.RevitAddins/Converters/Rv2WinColorConverter.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/Rv2WinColorConverter.cs
index 713bc08..1848191 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/Rv2WinColorConverter.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/Rv2WinColorConverter.cs
@@ -3,14 +3,19 @@ using System.Windows.Data;
 
 using Color = System.Windows.Media.Color;
 
-namespace ShrlAlgoToolkit.RevitAddins.Converters;
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters;
 
 /// <summary>
 /// Autodesk颜色转Windows系统颜色
 /// </summary>
 public class Rv2WinColorConverter : IValueConverter
 {
-    public static Rv2WinColorConverter Instance { get; } = new Rv2WinColorConverter();
+    public static Converters.Rv2WinColorConverter Instance { get; } = new Converters.Rv2WinColorConverter();
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
         var color = (Autodesk.Revit.DB.Color)value;
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/SearchFamilyValueConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchFamilyValueConverter.cs
similarity index 72%
rename from ShrlAlgoToolkit.RevitAddins/Converters/SearchFamilyValueConverter.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchFamilyValueConverter.cs
index ec5ee32..012034a 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/SearchFamilyValueConverter.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchFamilyValueConverter.cs
@@ -1,11 +1,16 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 
-namespace ShrlAlgoToolkit.RevitAddins.Converters
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters
 {
     public class SearchFamilyValueConverter : IMultiValueConverter
     {
-        public static SearchFamilyValueConverter Instance { get; } = new SearchFamilyValueConverter();
+        public static Converters.SearchFamilyValueConverter Instance { get; } = new Converters.SearchFamilyValueConverter();
         public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
             var cellText = values[0] == null ? string.Empty : values[0].ToString();
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/SearchTypeValueConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchTypeValueConverter.cs
similarity index 72%
rename from ShrlAlgoToolkit.RevitAddins/Converters/SearchTypeValueConverter.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchTypeValueConverter.cs
index 5c1ff37..231c2b7 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/SearchTypeValueConverter.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchTypeValueConverter.cs
@@ -1,11 +1,16 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 
-namespace ShrlAlgoToolkit.RevitAddins.Converters
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters
 {
     public class SearchTypeValueConverter : IMultiValueConverter
     {
-        public static SearchTypeValueConverter Instance { get; } = new SearchTypeValueConverter();
+        public static Converters.SearchTypeValueConverter Instance { get; } = new Converters.SearchTypeValueConverter();
         public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
             var cellText = values[0] == null ? string.Empty : values[0].ToString();
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/SearchValueConverter.cs b/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchValueConverter.cs
similarity index 77%
rename from ShrlAlgoToolkit.RevitAddins/Converters/SearchValueConverter.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchValueConverter.cs
index 4838ea3..90e43cf 100644
--- a/ShrlAlgoToolkit.RevitAddins/Converters/SearchValueConverter.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Converters/SearchValueConverter.cs
@@ -1,6 +1,11 @@
 using System.Windows.Data;
 
-namespace ShrlAlgoToolkit.RevitAddins.Converters;
+using ShrlAlgoToolkit.RevitAddins.UI.Converters;
+using ShrlAlgoToolkit;
+using ShrlAlgoToolkit.RevitAddins;
+using ShrlAlgoToolkit.RevitAddins.UI;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Converters;
 
 public class SearchValueConverter : IMultiValueConverter
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/Extensions/CommonExtensions.cs b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/CommonExtensions.cs
similarity index 90%
rename from ShrlAlgoToolkit.RevitAddins/Extensions/CommonExtensions.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Extensions/CommonExtensions.cs
index faeafc0..4bf9b15 100644
--- a/ShrlAlgoToolkit.RevitAddins/Extensions/CommonExtensions.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/CommonExtensions.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace ShrlAlgoToolkit.RevitAddins.Extensions
+namespace ShrlAlgoToolkit.RevitAddins.Common.Extensions
 {
     public static class CommonExtensions
     {
diff --git a/ShrlAlgoToolkit.RevitAddins/Extensions/DistinctExtensions.cs b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/DistinctExtensions.cs
similarity index 82%
rename from ShrlAlgoToolkit.RevitAddins/Extensions/DistinctExtensions.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Extensions/DistinctExtensions.cs
index 682bd4e..6e2f508 100644
--- a/ShrlAlgoToolkit.RevitAddins/Extensions/DistinctExtensions.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/DistinctExtensions.cs
@@ -1,4 +1,4 @@
-namespace ShrlAlgoToolkit.RevitAddins.Extensions;
+namespace ShrlAlgoToolkit.RevitAddins.Common.Extensions;
 
 /// <summary>
 /// 自定义Distinct扩展方法
@@ -8,9 +8,9 @@ public static class DistinctExtensions
     public static IEnumerable<T> Distinct<T>(
         this IEnumerable<T> source, Func<T, T, bool> comparer)
         where T : class
-        => source.Distinct(new DistinctExtensions.DynamicEqualityComparer<T>(comparer));
+        => source.Distinct(new Extensions.DistinctExtensions.DynamicEqualityComparer<T>(comparer));
     public static IEnumerable<T> Distinct<T, V>(this IEnumerable<T> source, Func<T, V> keySelector)
-        => source.Distinct(new DistinctExtensions.CommonEqualityComparer<T, V>(keySelector));
+        => source.Distinct(new Extensions.DistinctExtensions.CommonEqualityComparer<T, V>(keySelector));
     private sealed class DynamicEqualityComparer<T> : IEqualityComparer<T>
         where T : class
     {
diff --git a/ShrlAlgoToolkit.RevitAddins/Extensions/ImageExtensions.cs b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/ImageExtensions.cs
similarity index 97%
rename from ShrlAlgoToolkit.RevitAddins/Extensions/ImageExtensions.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Extensions/ImageExtensions.cs
index b471e5f..d83f9cb 100644
--- a/ShrlAlgoToolkit.RevitAddins/Extensions/ImageExtensions.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/ImageExtensions.cs
@@ -6,7 +6,7 @@ using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace ShrlAlgoToolkit.RevitAddins.Extensions;
+namespace ShrlAlgoToolkit.RevitAddins.Common.Extensions;
 
 public static class ImageExtensions
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/Common/Extensions/MiniExcelExtensions.cs b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/MiniExcelExtensions.cs
new file mode 100644
index 0000000..b2202e1
--- /dev/null
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/MiniExcelExtensions.cs
@@ -0,0 +1,114 @@
+using MiniExcelLibs;
+
+using System.IO;
+
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Extensions
+{
+    public static class MiniExcelExtensions
+    {
+        // --- 写入部分 (Write) ---
+
+        /// <summary>
+        /// 开始流式配置 Excel 写入
+        /// </summary>
+        public static Extensions.ExcelWriter<T> AsExcel<T>(this IEnumerable<T> data)
+        {
+            return new Extensions.ExcelWriter<T>(data);
+        }
+
+        /// <summary>
+        /// 快速保存多 Sheet 字典到文件
+        /// </summary>
+        public static void SaveAsExcel(this Dictionary<string, object> sheetsData, string filePath, bool overwrite = true)
+        {
+            // 自动清理 Sheet 名称中的非法字符
+            var sanitizedData = new Dictionary<string, object>();
+            foreach (var kvp in sheetsData)
+            {
+                sanitizedData.Add(SanitizeSheetName(kvp.Key), kvp.Value);
+            }
+            MiniExcel.SaveAs(filePath, sanitizedData, overwriteFile: overwrite);
+        }
+
+        // --- 读取部分 (Read) ---
+
+        /// <summary>
+        /// 从文件路径直接读取数据为强类型列表
+        /// </summary>
+        public static IEnumerable<T> ReadExcel<T>(this string filePath, string sheetName = null) where T : class, new()
+        {
+            if (!File.Exists(filePath)) throw new FileNotFoundException("Excel文件不存在", filePath);
+            return MiniExcel.Query<T>(filePath, sheetName: sheetName);
+        }
+
+        /// <summary>
+        /// 从文件路径读取为动态类型 (Dictionary/dynamic)
+        /// </summary>
+        public static IEnumerable<dynamic> ReadExcelDynamic(this string filePath, string sheetName = null)
+        {
+            if (!File.Exists(filePath)) throw new FileNotFoundException("Excel文件不存在", filePath);
+            return MiniExcel.Query(filePath, sheetName: sheetName);
+        }
+
+        // --- 工具方法 ---
+
+        /// <summary>
+        /// 清理 Excel Sheet 名称中的非法字符
+        /// </summary>
+        public static string SanitizeSheetName(string name)
+        {
+            if (string.IsNullOrEmpty(name)) return "Sheet1";
+            char[] invalidChars = { '\\', '/', '?', '*', '[', ']', ':' };
+            foreach (var c in invalidChars) name = name.Replace(c, '_');
+            return name.Length > 31 ? name.Substring(0, 31) : name;
+        }
+    }
+
+    public class ExcelWriter<T>
+    {
+        private readonly IEnumerable<T> data;
+        private string sheetName = "Sheet1";
+        private bool overwrite = true;
+
+        public ExcelWriter(IEnumerable<T> data) => this.data = data;
+
+        /// <summary>
+        /// 设置 Sheet 名称
+        /// </summary>
+        public Extensions.ExcelWriter<T> WithSheetName(string name)
+        {
+            sheetName = Extensions.MiniExcelExtensions.SanitizeSheetName(name);
+            return this;
+        }
+
+        /// <summary>
+        /// 设置是否覆盖
+        /// </summary>
+        public Extensions.ExcelWriter<T> Overwrite(bool canOverwrite = true)
+        {
+            overwrite = canOverwrite;
+            return this;
+        }
+
+        /// <summary>
+        /// 执行保存到文件
+        /// </summary>
+        public void SaveTo(string filePath)
+        {
+            MiniExcel.SaveAs(filePath, data, sheetName: sheetName, overwriteFile: overwrite);
+        }
+
+        /// <summary>
+        /// 转换为字节数组 (用于 Web 下载或内存操作)
+        /// </summary>
+        public byte[] ToBytes()
+        {
+            using (var ms = new MemoryStream())
+            {
+                ms.SaveAs(data, sheetName: sheetName);
+                return ms.ToArray();
+            }
+        }
+    }
+}
diff --git a/ShrlAlgoToolkit.RevitAddins/Extensions/StringExtensions.cs b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/StringExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.RevitAddins/Extensions/StringExtensions.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/Extensions/StringExtensions.cs
index d24b3cb..c8d5d8d 100644
--- a/ShrlAlgoToolkit.RevitAddins/Extensions/StringExtensions.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/Extensions/StringExtensions.cs
@@ -1,7 +1,8 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace ShrlAlgoToolkit.RevitAddins.Extensions;
+
+namespace ShrlAlgoToolkit.RevitAddins.Common.Extensions;
 #region 格式化
 
 //StringFormat={}{0:C} $123.46
diff --git a/ShrlAlgoToolkit.RevitAddins/ValidationRules/DoubleValidationRule.cs b/ShrlAlgoToolkit.RevitAddins/Common/ValidationRules/DoubleValidationRule.cs
similarity index 85%
rename from ShrlAlgoToolkit.RevitAddins/ValidationRules/DoubleValidationRule.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/ValidationRules/DoubleValidationRule.cs
index e36a3fd..40433b7 100644
--- a/ShrlAlgoToolkit.RevitAddins/ValidationRules/DoubleValidationRule.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/ValidationRules/DoubleValidationRule.cs
@@ -1,7 +1,6 @@
 using System.Globalization;
 using System.Windows.Controls;
-
-namespace ShrlAlgoToolkit.Mvvm.ValidationRules;
+namespace ShrlAlgoToolkit.RevitAddins.Common.ValidationRules;
 
 public class DoubleValidationRule : ValidationRule
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/ValidationRules/RangeVaildationRule.cs b/ShrlAlgoToolkit.RevitAddins/Common/ValidationRules/RangeVaildationRule.cs
similarity index 89%
rename from ShrlAlgoToolkit.RevitAddins/ValidationRules/RangeVaildationRule.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/ValidationRules/RangeVaildationRule.cs
index 4bb1a15..cae997e 100644
--- a/ShrlAlgoToolkit.RevitAddins/ValidationRules/RangeVaildationRule.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/ValidationRules/RangeVaildationRule.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Windows.Controls;
 
-namespace ShrlAlgoToolkit.Mvvm.ValidationRules;
+namespace ShrlAlgoToolkit.RevitAddins.Common.ValidationRules;
 
 public class RangeValidationRule : ValidationRule
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/ValidationRules/RequiredValidationRule.cs b/ShrlAlgoToolkit.RevitAddins/Common/ValidationRules/RequiredValidationRule.cs
similarity index 95%
rename from ShrlAlgoToolkit.RevitAddins/ValidationRules/RequiredValidationRule.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/ValidationRules/RequiredValidationRule.cs
index 98ff9bc..d6a3b24 100644
--- a/ShrlAlgoToolkit.RevitAddins/ValidationRules/RequiredValidationRule.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/ValidationRules/RequiredValidationRule.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Windows.Controls;
 
-namespace ShrlAlgoToolkit.Mvvm.ValidationRules;
+namespace ShrlAlgoToolkit.RevitAddins.Common.ValidationRules;
 
 public class RequiredValidationRule : ValidationRule
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/ValidationRules/UndefinedCharRules.cs b/ShrlAlgoToolkit.RevitAddins/Common/ValidationRules/UndefinedCharRules.cs
similarity index 92%
rename from ShrlAlgoToolkit.RevitAddins/ValidationRules/UndefinedCharRules.cs
rename to ShrlAlgoToolkit.RevitAddins/Common/ValidationRules/UndefinedCharRules.cs
index d3bc245..d4c6971 100644
--- a/ShrlAlgoToolkit.RevitAddins/ValidationRules/UndefinedCharRules.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Common/ValidationRules/UndefinedCharRules.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Windows.Controls;
 
-namespace ShrlAlgoToolkit.Mvvm.ValidationRules
+namespace ShrlAlgoToolkit.RevitAddins.Common.ValidationRules
 {
     public class UndefinedCharRules : ValidationRule
     {
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/BooleanToVisConverter.cs b/ShrlAlgoToolkit.RevitAddins/Converters/BooleanToVisConverter.cs
deleted file mode 100644
index 68756d5..0000000
--- a/ShrlAlgoToolkit.RevitAddins/Converters/BooleanToVisConverter.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Windows;
-
-namespace ShrlAlgoToolkit.RevitAddins.Converters;
-
-public class BooleanToVisConverter : Converters.BooleanConverter<Visibility>
-{
-    public BooleanToVisConverter() : base(Visibility.Visible, Visibility.Collapsed)
-    {
-    }
-}
diff --git a/ShrlAlgoToolkit.RevitAddins/Converters/InverterBooleanToVisConverter.cs b/ShrlAlgoToolkit.RevitAddins/Converters/InverterBooleanToVisConverter.cs
deleted file mode 100644
index af4a0a7..0000000
--- a/ShrlAlgoToolkit.RevitAddins/Converters/InverterBooleanToVisConverter.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Windows;
-
-namespace ShrlAlgoToolkit.RevitAddins.Converters;
-
-public class InverterBooleanToVisConverter : Converters.BooleanConverter<Visibility>
-{
-    public InverterBooleanToVisConverter() : base(Visibility.Collapsed, Visibility.Visible)
-    {
-    }
-}
-
diff --git a/ShrlAlgoToolkit.RevitAddins/Fonts/AwesomeFreeRegular.cs b/ShrlAlgoToolkit.RevitAddins/Fonts/AwesomeFreeRegular.cs
deleted file mode 100644
index 7e6777a..0000000
--- a/ShrlAlgoToolkit.RevitAddins/Fonts/AwesomeFreeRegular.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-namespace ShrlAlgoToolkit.RevitAddins.Fonts;
-// Generated by IconFont2Code: https://andreinitescu.github.io/IconFont2Code
-// If you change the class to 'public' in order to use it outside its assembly
-//  you should also change the fields from 'const' to 'public static readonly'
-static class AwesomeFreeRegular
-{
-    public const string Space = "\u0020";
-    public const string Exclamation = "\u0021";
-    public const string Hashtag = "\u0023";
-    public const string DollarSign = "\u0024";
-    public const string Percent = "\u0025";
-    public const string Asterisk = "\u002a";
-    public const string Plus = "\u002b";
-    public const string Hyphen = "\u002d";
-    public const string _0 = "\u0030";
-    public const string _1 = "\u0031";
-    public const string _2 = "\u0032";
-    public const string _3 = "\u0033";
-    public const string _4 = "\u0034";
-    public const string _5 = "\u0035";
-    public const string _6 = "\u0036";
-    public const string _7 = "\u0037";
-    public const string _8 = "\u0038";
-    public const string _9 = "\u0039";
-    public const string LessThan = "\u003c";
-    public const string _Equals = "\u003d";
-    public const string GreaterThan = "\u003e";
-    public const string Question = "\u003f";
-    public const string At = "\u0040";
-    public const string a = "\u0041";
-    public const string b = "\u0042";
-    public const string c = "\u0043";
-    public const string d = "\u0044";
-    public const string e = "\u0045";
-    public const string f = "\u0046";
-    public const string g = "\u0047";
-    public const string h = "\u0048";
-    public const string i = "\u0049";
-    public const string j = "\u004a";
-    public const string k = "\u004b";
-    public const string l = "\u004c";
-    public const string m = "\u004d";
-    public const string n = "\u004e";
-    public const string o = "\u004f";
-    public const string p = "\u0050";
-    public const string q = "\u0051";
-    public const string r = "\u0052";
-    public const string s = "\u0053";
-    public const string t = "\u0054";
-    public const string u = "\u0055";
-    public const string v = "\u0056";
-    public const string w = "\u0057";
-    public const string x = "\u0058";
-    public const string y = "\u0059";
-    public const string z = "\u005a";
-    public const string ZeroWidthSpace = "\u0022";
-    public const string FolderClosed = "\ue185";
-    public const string Notdef = "\ue1fe";
-    public const string Heart = "\u2665";
-    public const string Star = "\u2b50";
-    public const string User = "\uf007";
-    public const string Clock = "\uf017";
-    public const string RectangleList = "\uf022";
-    public const string Flag = "\uf024";
-    public const string Bookmark = "\uf02e";
-    public const string Image = "\uf03e";
-    public const string PenToSquare = "\uf044";
-    public const string CircleXmark = "\uf057";
-    public const string CircleCheck = "\uf058";
-    public const string CircleQuestion = "\uf059";
-    public const string Eye = "\uf06e";
-    public const string EyeSlash = "\uf070";
-    public const string CalendarDays = "\uf073";
-    public const string Comment = "\uf075";
-    public const string Folder = "\uf07b";
-    public const string FolderOpen = "\uf07c";
-    public const string ChartBar = "\uf080";
-    public const string Comments = "\uf086";
-    public const string StarHalf = "\uf089";
-    public const string Lemon = "\uf094";
-    public const string CreditCard = "\uf09d";
-    public const string HardDrive = "\uf0a0";
-    public const string HandPointRight = "\uf0a4";
-    public const string HandPointLeft = "\uf0a5";
-    public const string HandPointUp = "\u261d";
-    public const string HandPointDown = "\uf0a7";
-    public const string Copy = "\uf0c5";
-    public const string FloppyDisk = "\uf0c7";
-    public const string Square = "\u25a0";
-    public const string Envelope = "\u2709";
-    public const string Paste = "\uf0ea";
-    public const string Lightbulb = "\uf0eb";
-    public const string Bell = "\uf0a2";
-    public const string Hospital = "\uf0f8";
-    public const string SquarePlus = "\uf0fe";
-    public const string Circle = "\u25cf";
-    public const string FaceSmile = "\uf118";
-    public const string FaceFrown = "\u2639";
-    public const string FaceMeh = "\uf11a";
-    public const string Keyboard = "\u2328";
-    public const string Calendar = "\uf133";
-    public const string CirclePlay = "\uf01d";
-    public const string SquareMinus = "\uf146";
-    public const string SquareCheck = "\u2611";
-    public const string ShareFromSquare = "\uf045";
-    public const string Compass = "\uf14e";
-    public const string SquareCaretDown = "\uf150";
-    public const string SquareCaretUp = "\uf151";
-    public const string SquareCaretRight = "\uf152";
-    public const string File = "\uf016";
-    public const string FileLines = "\uf0f6";
-    public const string ThumbsUp = "\uf087";
-    public const string ThumbsDown = "\uf088";
-    public const string Sun = "\u2600";
-    public const string Moon = "\u23fe";
-    public const string SquareCaretLeft = "\uf191";
-    public const string CircleDot = "\uf192";
-    public const string Building = "\uf0f7";
-    public const string FilePdf = "\uf1c1";
-    public const string FileWord = "\uf1c2";
-    public const string FileExcel = "\uf1c3";
-    public const string FilePowerpoint = "\uf1c4";
-    public const string FileImage = "\uf1c5";
-    public const string FileZipper = "\uf1c6";
-    public const string FileAudio = "\uf1c7";
-    public const string FileVideo = "\uf1c8";
-    public const string FileCode = "\uf1c9";
-    public const string LifeRing = "\uf1cd";
-    public const string PaperPlane = "\uf1d8";
-    public const string Futbol = "\u26bd";
-    public const string Newspaper = "\uf1ea";
-    public const string BellSlash = "\uf1f6";
-    public const string Copyright = "\u00a9";
-    public const string ClosedCaptioning = "\uf20a";
-    public const string ObjectGroup = "\uf247";
-    public const string ObjectUngroup = "\uf248";
-    public const string NoteSticky = "\uf249";
-    public const string Clone = "\uf24d";
-    public const string HourglassHalf = "\uf252";
-    public const string Hourglass = "\u23f3";
-    public const string HandBackFist = "\uf255";
-    public const string Hand = "\u270b";
-    public const string HandScissors = "\uf257";
-    public const string HandLizard = "\uf258";
-    public const string HandSpock = "\uf259";
-    public const string HandPointer = "\uf25a";
-    public const string HandPeace = "\u270c";
-    public const string Registered = "\u00ae";
-    public const string CalendarPlus = "\uf271";
-    public const string CalendarMinus = "\uf272";
-    public const string CalendarXmark = "\uf273";
-    public const string CalendarCheck = "\uf274";
-    public const string Map = "\uf278";
-    public const string Message = "\uf27a";
-    public const string CirclePause = "\uf28b";
-    public const string CircleStop = "\uf28d";
-    public const string FontAwesome = "\uf2b4";
-    public const string Handshake = "\uf2b5";
-    public const string EnvelopeOpen = "\uf2b6";
-    public const string AddressBook = "\uf2b9";
-    public const string AddressCard = "\uf2bb";
-    public const string CircleUser = "\uf2bd";
-    public const string IdBadge = "\uf2c1";
-    public const string IdCard = "\uf2c2";
-    public const string WindowMaximize = "\uf2d0";
-    public const string WindowMinimize = "\uf2d1";
-    public const string WindowRestore = "\uf2d2";
-    public const string Snowflake = "\u2744";
-    public const string TrashCan = "\uf014";
-    public const string Images = "\uf302";
-    public const string Clipboard = "\uf328";
-    public const string CircleDown = "\uf01a";
-    public const string CircleLeft = "\uf190";
-    public const string CircleRight = "\uf18e";
-    public const string CircleUp = "\uf01b";
-    public const string Gem = "\uf3a5";
-    public const string MoneyBill1 = "\uf3d1";
-    public const string RectangleXmark = "\uf2d4";
-    public const string ChessBishop = "\u265d";
-    public const string ChessKing = "\u265a";
-    public const string ChessKnight = "\u265e";
-    public const string ChessPawn = "\u265f";
-    public const string ChessQueen = "\u265b";
-    public const string ChessRook = "\u265c";
-    public const string SquareFull = "\u2b1b";
-    public const string CommentDots = "\uf27b";
-    public const string FaceSmileWink = "\uf4da";
-    public const string FaceAngry = "\uf556";
-    public const string FaceDizzy = "\uf567";
-    public const string FaceFlushed = "\uf579";
-    public const string FaceFrownOpen = "\uf57a";
-    public const string FaceGrimace = "\uf57f";
-    public const string FaceGrin = "\uf580";
-    public const string FaceGrinWide = "\uf581";
-    public const string FaceGrinBeam = "\uf582";
-    public const string FaceGrinBeamSweat = "\uf583";
-    public const string FaceGrinHearts = "\uf584";
-    public const string FaceGrinSquint = "\uf585";
-    public const string FaceGrinSquintTears = "\uf586";
-    public const string FaceGrinStars = "\uf587";
-    public const string FaceGrinTears = "\uf588";
-    public const string FaceGrinTongue = "\uf589";
-    public const string FaceGrinTongueSquint = "\uf58a";
-    public const string FaceGrinTongueWink = "\uf58b";
-    public const string FaceGrinWink = "\uf58c";
-    public const string FaceKiss = "\uf596";
-    public const string FaceKissBeam = "\uf597";
-    public const string FaceKissWinkHeart = "\uf598";
-    public const string FaceLaugh = "\uf599";
-    public const string FaceLaughBeam = "\uf59a";
-    public const string FaceLaughSquint = "\uf59b";
-    public const string FaceLaughWink = "\uf59c";
-    public const string FaceMehBlank = "\uf5a4";
-    public const string FaceRollingEyes = "\uf5a5";
-    public const string FaceSadCry = "\uf5b3";
-    public const string FaceSadTear = "\uf5b4";
-    public const string FaceSmileBeam = "\uf5b8";
-    public const string StarHalfStroke = "\uf5c0";
-    public const string FaceSurprise = "\uf5c2";
-    public const string FaceTired = "\uf5c8";
-}
diff --git a/ShrlAlgoToolkit.RevitAddins/Fonts/BoxIconFont.cs b/ShrlAlgoToolkit.RevitAddins/Fonts/BoxIconFont.cs
deleted file mode 100644
index 3355aca..0000000
--- a/ShrlAlgoToolkit.RevitAddins/Fonts/BoxIconFont.cs
+++ /dev/null
@@ -1,1609 +0,0 @@
-namespace ShrlAlgoToolkit.RevitAddins.Fonts
-{
-    // Generated by IconFont2Code: https://andreinitescu.github.io/IconFont2Code
-    // If you change the class to 'public' in order to use it outside its assembly
-    //  you should also change the fields from 'const' to 'public static readonly'
-    internal static class BoxIconFont
-    {
-        public const string BxAbacus = "\ue99d";
-        public const string BxAccessibility = "\ue99e";
-        public const string BxAddToQueue = "\ue99f";
-        public const string BxAdjust = "\ue9a0";
-        public const string BxAlarm = "\ue9a1";
-        public const string BxAlarmAdd = "\ue9a2";
-        public const string BxAlarmExclamation = "\ue9a3";
-        public const string BxAlarmOff = "\ue9a4";
-        public const string BxAlarmSnooze = "\ue9a5";
-        public const string BxAlbum = "\ue9a6";
-        public const string BxAlignJustify = "\ue9a7";
-        public const string BxAlignLeft = "\ue9a8";
-        public const string BxAlignMiddle = "\ue9a9";
-        public const string BxAlignRight = "\ue9aa";
-        public const string BxAnalyse = "\ue9ab";
-        public const string BxAnchor = "\ue9ac";
-        public const string BxAngry = "\ue9ad";
-        public const string BxAperture = "\ue9ae";
-        public const string BxArch = "\ue9af";
-        public const string BxArchive = "\ue9b0";
-        public const string BxArchiveIn = "\ue9b1";
-        public const string BxArchiveOut = "\ue9b2";
-        public const string BxArea = "\ue9b3";
-        public const string BxArrowBack = "\ue9b4";
-        public const string BxArrowFromBottom = "\ue9b5";
-        public const string BxArrowFromLeft = "\ue9b6";
-        public const string BxArrowFromRight = "\ue9b7";
-        public const string BxArrowFromTop = "\ue9b8";
-        public const string BxArrowToBottom = "\ue9b9";
-        public const string BxArrowToLeft = "\ue9ba";
-        public const string BxArrowToRight = "\ue9bb";
-        public const string BxArrowToTop = "\ue9bc";
-        public const string BxAt = "\ue9bd";
-        public const string BxAtom = "\ue9be";
-        public const string BxAward = "\ue9bf";
-        public const string BxBadge = "\ue9c0";
-        public const string BxBadgeCheck = "\ue9c1";
-        public const string BxBaguette = "\uef0d";
-        public const string BxBall = "\ue9c2";
-        public const string BxBandAid = "\ue9c3";
-        public const string BxBarChart = "\ue9c4";
-        public const string BxBarChartAlt = "\ue9c5";
-        public const string BxBarChartAlt2 = "\ue9c6";
-        public const string BxBarChartSquare = "\ue9c7";
-        public const string BxBarcode = "\ue9c8";
-        public const string BxBarcodeReader = "\ue9c9";
-        public const string BxBaseball = "\ue9ca";
-        public const string BxBasket = "\ue9cb";
-        public const string BxBasketball = "\ue9cc";
-        public const string BxBath = "\ue9cd";
-        public const string BxBattery = "\ue9ce";
-        public const string BxBed = "\ue9cf";
-        public const string BxBeenHere = "\ue9d0";
-        public const string BxBeer = "\ue9d1";
-        public const string BxBell = "\ue9d2";
-        public const string BxBellMinus = "\ue9d3";
-        public const string BxBellOff = "\ue9d4";
-        public const string BxBellPlus = "\ue9d5";
-        public const string BxBible = "\ue9d6";
-        public const string BxBitcoin = "\ue9d7";
-        public const string BxBlanket = "\ue9d8";
-        public const string BxBlock = "\ue9d9";
-        public const string BxBluetooth = "\ue9da";
-        public const string BxBody = "\ue9db";
-        public const string BxBold = "\ue9dc";
-        public const string BxBoltCircle = "\ue9dd";
-        public const string BxBomb = "\ue9de";
-        public const string BxBone = "\ue9df";
-        public const string BxBong = "\ue9e0";
-        public const string BxBook = "\ue9e1";
-        public const string BxBookAdd = "\ue9e2";
-        public const string BxBookAlt = "\ue9e3";
-        public const string BxBookBookmark = "\ue9e4";
-        public const string BxBookContent = "\ue9e5";
-        public const string BxBookHeart = "\ue9e6";
-        public const string BxBookmark = "\ue9e7";
-        public const string BxBookmarkAlt = "\ue9e8";
-        public const string BxBookmarkAltMinus = "\ue9e9";
-        public const string BxBookmarkAltPlus = "\ue9ea";
-        public const string BxBookmarkHeart = "\ue9eb";
-        public const string BxBookmarkMinus = "\ue9ec";
-        public const string BxBookmarkPlus = "\ue9ed";
-        public const string BxBookmarks = "\ue9ee";
-        public const string BxBookOpen = "\ue9ef";
-        public const string BxBookReader = "\ue9f0";
-        public const string BxBorderAll = "\ue9f1";
-        public const string BxBorderBottom = "\ue9f2";
-        public const string BxBorderInner = "\ue9f3";
-        public const string BxBorderLeft = "\ue9f4";
-        public const string BxBorderNone = "\ue9f5";
-        public const string BxBorderOuter = "\ue9f6";
-        public const string BxBorderRadius = "\ue9f7";
-        public const string BxBorderRight = "\ue9f8";
-        public const string BxBorderTop = "\ue9f9";
-        public const string BxBot = "\ue9fa";
-        public const string BxBowlHot = "\uef0e";
-        public const string BxBowlingBall = "\ue9fb";
-        public const string BxBowlRice = "\uef0f";
-        public const string BxBox = "\ue9fc";
-        public const string BxBracket = "\ue9fd";
-        public const string BxBraille = "\ue9fe";
-        public const string BxBrain = "\ue9ff";
-        public const string BxBriefcase = "\uea00";
-        public const string BxBriefcaseAlt = "\uea01";
-        public const string BxBriefcaseAlt2 = "\uea02";
-        public const string BxBrightness = "\uea03";
-        public const string BxBrightnessHalf = "\uea04";
-        public const string BxBroadcast = "\uea05";
-        public const string BxBrush = "\uea06";
-        public const string BxBrushAlt = "\uea07";
-        public const string BxBug = "\uea08";
-        public const string BxBugAlt = "\uea09";
-        public const string BxBuilding = "\uea0a";
-        public const string BxBuildingHouse = "\uea0b";
-        public const string BxBuildings = "\uea0c";
-        public const string BxBulb = "\uea0d";
-        public const string BxBullseye = "\uea0e";
-        public const string BxBuoy = "\uea0f";
-        public const string BxBus = "\uea10";
-        public const string BxBusSchool = "\uea11";
-        public const string BxCabinet = "\uea12";
-        public const string BxCableCar = "\uef10";
-        public const string BxCake = "\uea13";
-        public const string BxCalculator = "\uea14";
-        public const string BxCalendar = "\uea15";
-        public const string BxCalendarAlt = "\uea16";
-        public const string BxCalendarCheck = "\uea17";
-        public const string BxCalendarEdit = "\uea18";
-        public const string BxCalendarEvent = "\uea19";
-        public const string BxCalendarExclamation = "\uea1a";
-        public const string BxCalendarHeart = "\uea1b";
-        public const string BxCalendarMinus = "\uea1c";
-        public const string BxCalendarPlus = "\uea1d";
-        public const string BxCalendarStar = "\uea1e";
-        public const string BxCalendarWeek = "\uea1f";
-        public const string BxCalendarX = "\uea20";
-        public const string BxCamera = "\uea21";
-        public const string BxCameraHome = "\uea22";
-        public const string BxCameraMovie = "\uea23";
-        public const string BxCameraOff = "\uea24";
-        public const string BxCandles = "\uef11";
-        public const string BxCapsule = "\uea25";
-        public const string BxCaptions = "\uea26";
-        public const string BxCar = "\uea27";
-        public const string BxCard = "\uea28";
-        public const string BxCaretDown = "\uea29";
-        public const string BxCaretDownCircle = "\uea2a";
-        public const string BxCaretDownSquare = "\uea2b";
-        public const string BxCaretLeft = "\uea2c";
-        public const string BxCaretLeftCircle = "\uea2d";
-        public const string BxCaretLeftSquare = "\uea2e";
-        public const string BxCaretRight = "\uea2f";
-        public const string BxCaretRightCircle = "\uea30";
-        public const string BxCaretRightSquare = "\uea31";
-        public const string BxCaretUp = "\uea32";
-        public const string BxCaretUpCircle = "\uea33";
-        public const string BxCaretUpSquare = "\uea34";
-        public const string BxCarousel = "\uea35";
-        public const string BxCart = "\uea36";
-        public const string BxCartAdd = "\uef30";
-        public const string BxCartAlt = "\uea37";
-        public const string BxCartDownload = "\uef31";
-        public const string BxCast = "\uea38";
-        public const string BxCategory = "\uea39";
-        public const string BxCategoryAlt = "\uea3a";
-        public const string BxCctv = "\uea3b";
-        public const string BxCertification = "\uea3c";
-        public const string BxChair = "\uea3d";
-        public const string BxChalkboard = "\uea3e";
-        public const string BxChart = "\uea3f";
-        public const string BxChat = "\uea40";
-        public const string BxCheck = "\uea41";
-        public const string BxCheckbox = "\uea42";
-        public const string BxCheckboxChecked = "\uea43";
-        public const string BxCheckboxMinus = "\uea44";
-        public const string BxCheckboxSquare = "\uea45";
-        public const string BxCheckCircle = "\uea46";
-        public const string BxCheckDouble = "\uea47";
-        public const string BxCheckShield = "\uea48";
-        public const string BxCheckSquare = "\uea49";
-        public const string BxCheese = "\uef2f";
-        public const string BxChevronDown = "\uea4a";
-        public const string BxChevronDownCircle = "\uea4b";
-        public const string BxChevronDownSquare = "\uea4c";
-        public const string BxChevronLeft = "\uea4d";
-        public const string BxChevronLeftCircle = "\uea4e";
-        public const string BxChevronLeftSquare = "\uea4f";
-        public const string BxChevronRight = "\uea50";
-        public const string BxChevronRightCircle = "\uea51";
-        public const string BxChevronRightSquare = "\uea52";
-        public const string BxChevronsDown = "\uea53";
-        public const string BxChevronsLeft = "\uea54";
-        public const string BxChevronsRight = "\uea55";
-        public const string BxChevronsUp = "\uea56";
-        public const string BxChevronUp = "\uea57";
-        public const string BxChevronUpCircle = "\uea58";
-        public const string BxChevronUpSquare = "\uea59";
-        public const string BxChip = "\uea5a";
-        public const string BxChurch = "\uea5b";
-        public const string BxCircle = "\uea5c";
-        public const string BxCircleHalf = "\uef12";
-        public const string BxCircleQuarter = "\uef13";
-        public const string BxCircleThreeQuarter = "\uef14";
-        public const string BxClinic = "\uea5d";
-        public const string BxClipboard = "\uea5e";
-        public const string BxCloset = "\uea5f";
-        public const string BxCloud = "\uea60";
-        public const string BxCloudDownload = "\uea61";
-        public const string BxCloudDrizzle = "\uea62";
-        public const string BxCloudLightning = "\uea63";
-        public const string BxCloudLightRain = "\uea64";
-        public const string BxCloudRain = "\uea65";
-        public const string BxCloudSnow = "\uea66";
-        public const string BxCloudUpload = "\uea67";
-        public const string BxCode = "\uea68";
-        public const string BxCodeAlt = "\uea69";
-        public const string BxCodeBlock = "\uea6a";
-        public const string BxCodeCurly = "\uea6b";
-        public const string BxCoffee = "\uea6c";
-        public const string BxCoffeeTogo = "\uea6d";
-        public const string BxCog = "\uea6e";
-        public const string BxCoin = "\uea6f";
-        public const string BxCoinStack = "\uea70";
-        public const string BxCollapse = "\uea71";
-        public const string BxCollapseAlt = "\ue994";
-        public const string BxCollapseHorizontal = "\ue995";
-        public const string BxCollapseVertical = "\ue996";
-        public const string BxCollection = "\uea72";
-        public const string BxColor = "\uef3c";
-        public const string BxColorFill = "\uea73";
-        public const string BxColumns = "\uea74";
-        public const string BxCommand = "\uea75";
-        public const string BxComment = "\uea76";
-        public const string BxCommentAdd = "\uea77";
-        public const string BxCommentCheck = "\uea78";
-        public const string BxCommentDetail = "\uea79";
-        public const string BxCommentDots = "\uea7a";
-        public const string BxCommentEdit = "\uea7b";
-        public const string BxCommentError = "\uea7c";
-        public const string BxCommentMinus = "\uea7d";
-        public const string BxCommentX = "\uea7e";
-        public const string BxCompass = "\uea7f";
-        public const string BxConfused = "\uea80";
-        public const string BxConversation = "\uea81";
-        public const string BxCookie = "\uea82";
-        public const string BxCool = "\uea83";
-        public const string BxCopy = "\uea84";
-        public const string BxCopyAlt = "\uea85";
-        public const string BxCopyright = "\uea86";
-        public const string BxCreditCard = "\uea87";
-        public const string BxCreditCardAlt = "\uea88";
-        public const string BxCreditCardFront = "\uea89";
-        public const string BxCricketBall = "\uef0c";
-        public const string BxCrop = "\uea8a";
-        public const string BxCross = "\uef15";
-        public const string BxCrosshair = "\uea8b";
-        public const string BxCrown = "\uea8c";
-        public const string BxCube = "\uea8d";
-        public const string BxCubeAlt = "\uea8e";
-        public const string BxCuboid = "\uea8f";
-        public const string BxCurrentLocation = "\uea90";
-        public const string BxCustomize = "\uea91";
-        public const string BxCut = "\uea92";
-        public const string BxCycling = "\uea93";
-        public const string BxCylinder = "\uea94";
-        public const string BxData = "\uea95";
-        public const string BxDesktop = "\uea96";
-        public const string BxDetail = "\uea97";
-        public const string BxDevices = "\uea98";
-        public const string BxDialpad = "\uea99";
-        public const string BxDialpadAlt = "\uea9a";
-        public const string BxDiamond = "\uea9b";
-        public const string BxDice1 = "\uea9c";
-        public const string BxDice2 = "\uea9d";
-        public const string BxDice3 = "\uea9e";
-        public const string BxDice4 = "\uea9f";
-        public const string BxDice5 = "\ueaa0";
-        public const string BxDice6 = "\ueaa1";
-        public const string BxDirections = "\ueaa2";
-        public const string BxDisc = "\ueaa3";
-        public const string BxDish = "\ueaa4";
-        public const string BxDislike = "\ueaa5";
-        public const string BxDizzy = "\ueaa6";
-        public const string BxDna = "\ueaa7";
-        public const string BxDockBottom = "\ueaa8";
-        public const string BxDockLeft = "\ueaa9";
-        public const string BxDockRight = "\ueaaa";
-        public const string BxDockTop = "\ueaab";
-        public const string BxDollar = "\ueaac";
-        public const string BxDollarCircle = "\ueaad";
-        public const string BxDonateBlood = "\ueaae";
-        public const string BxDonateHeart = "\ueaaf";
-        public const string BxDoorOpen = "\ueab0";
-        public const string BxDotsHorizontal = "\ueab1";
-        public const string BxDotsHorizontalRounded = "\ueab2";
-        public const string BxDotsVertical = "\ueab3";
-        public const string BxDotsVerticalRounded = "\ueab4";
-        public const string BxDoughnutChart = "\ueab5";
-        public const string BxDownArrow = "\ueab6";
-        public const string BxDownArrowAlt = "\ueab7";
-        public const string BxDownArrowCircle = "\ueab8";
-        public const string BxDownload = "\ueab9";
-        public const string BxDownvote = "\ueaba";
-        public const string BxDrink = "\ueabb";
-        public const string BxDroplet = "\ueabc";
-        public const string BxDumbbell = "\ueabd";
-        public const string BxDuplicate = "\ueabe";
-        public const string BxEdit = "\ueabf";
-        public const string BxEditAlt = "\ueac0";
-        public const string BxEnvelope = "\ueac1";
-        public const string BxEnvelopeOpen = "\ueac2";
-        public const string BxEqualizer = "\ueac3";
-        public const string BxEraser = "\ueac4";
-        public const string BxError = "\ueac5";
-        public const string BxErrorAlt = "\ueac6";
-        public const string BxErrorCircle = "\ueac7";
-        public const string BxEuro = "\ueac8";
-        public const string BxExclude = "\ueac9";
-        public const string BxExit = "\ueaca";
-        public const string BxExitFullscreen = "\ueacb";
-        public const string BxExpand = "\ueacc";
-        public const string BxExpandAlt = "\ueacd";
-        public const string BxExpandHorizontal = "\ue997";
-        public const string BxExpandVertical = "\ue998";
-        public const string BxExport = "\ueace";
-        public const string BxExtension = "\ueacf";
-        public const string BxFace = "\uead0";
-        public const string BxFastForward = "\uead1";
-        public const string BxFastForwardCircle = "\uead2";
-        public const string BxFemale = "\uead3";
-        public const string BxFemaleSign = "\uead4";
-        public const string BxFile = "\uead5";
-        public const string BxFileBlank = "\uead6";
-        public const string BxFileFind = "\uead7";
-        public const string BxFilm = "\uead8";
-        public const string BxFilter = "\uead9";
-        public const string BxFilterAlt = "\ueada";
-        public const string BxFingerprint = "\ueadb";
-        public const string BxFirstAid = "\ueadc";
-        public const string BxFirstPage = "\ueadd";
-        public const string BxFlag = "\ueade";
-        public const string BxFolder = "\ueadf";
-        public const string BxFolderMinus = "\ueae0";
-        public const string BxFolderOpen = "\ueae1";
-        public const string BxFolderPlus = "\ueae2";
-        public const string BxFont = "\ueae3";
-        public const string BxFontColor = "\ueae4";
-        public const string BxFontFamily = "\ueae5";
-        public const string BxFontSize = "\ueae6";
-        public const string BxFoodMenu = "\ueae7";
-        public const string BxFoodTag = "\ueae8";
-        public const string BxFootball = "\ueae9";
-        public const string BxFork = "\uef16";
-        public const string BxFridge = "\ueaea";
-        public const string BxFullscreen = "\ueaeb";
-        public const string BxGame = "\ueaec";
-        public const string BxGasPump = "\ueaed";
-        public const string BxGhost = "\ueaee";
-        public const string BxGift = "\ueaef";
-        public const string BxGitBranch = "\ueaf0";
-        public const string BxGitCommit = "\ueaf1";
-        public const string BxGitCompare = "\ueaf2";
-        public const string BxGitMerge = "\ueaf3";
-        public const string BxGitPullRequest = "\ueaf4";
-        public const string BxGitRepoForked = "\ueaf5";
-        public const string BxGlasses = "\ueaf6";
-        public const string BxGlassesAlt = "\ueaf7";
-        public const string BxGlobe = "\ueaf8";
-        public const string BxGlobeAlt = "\ueaf9";
-        public const string BxGrid = "\ueafa";
-        public const string BxGridAlt = "\ueafb";
-        public const string BxGridHorizontal = "\ueafc";
-        public const string BxGridSmall = "\ueafd";
-        public const string BxGridVertical = "\ueafe";
-        public const string BxGroup = "\ueaff";
-        public const string BxHandicap = "\ueb00";
-        public const string BxHappy = "\ueb01";
-        public const string BxHappyAlt = "\ueb02";
-        public const string BxHappyBeaming = "\ueb03";
-        public const string BxHappyHeartEyes = "\ueb04";
-        public const string BxHardHat = "\uef2e";
-        public const string BxHash = "\ueb05";
-        public const string BxHdd = "\ueb06";
-        public const string BxHeading = "\ueb07";
-        public const string BxHeadphone = "\ueb08";
-        public const string BxHealth = "\ueb09";
-        public const string BxHeart = "\ueb0a";
-        public const string BxHeartCircle = "\ueb0b";
-        public const string BxHeartSquare = "\ueb0c";
-        public const string BxHelpCircle = "\ueb0d";
-        public const string BxHide = "\ueb0e";
-        public const string BxHighlight = "\ueb0f";
-        public const string BxHistory = "\ueb10";
-        public const string BxHive = "\ueb11";
-        public const string BxHome = "\ueb12";
-        public const string BxHomeAlt = "\ueb13";
-        public const string BxHomeAlt2 = "\uef2d";
-        public const string BxHomeCircle = "\ueb14";
-        public const string BxHomeHeart = "\ueb15";
-        public const string BxHomeSmile = "\ueb16";
-        public const string BxHorizontalCenter = "\ueb17";
-        public const string BxHotel = "\ueb18";
-        public const string BxHourglass = "\ueb19";
-        public const string BxIdCard = "\ueb1a";
-        public const string BxImage = "\ueb1b";
-        public const string BxImageAdd = "\ueb1c";
-        public const string BxImageAlt = "\ueb1d";
-        public const string BxImages = "\ueb1e";
-        public const string BxImport = "\ueb1f";
-        public const string BxInfinite = "\ueb20";
-        public const string BxInfoCircle = "\ueb21";
-        public const string BxInfoSquare = "\ueb22";
-        public const string BxInjection = "\ue999";
-        public const string BxIntersect = "\ueb23";
-        public const string BxItalic = "\ueb24";
-        public const string BxJoystick = "\ueb25";
-        public const string BxJoystickAlt = "\ueb26";
-        public const string BxJoystickButton = "\ueb27";
-        public const string BxKey = "\ueb28";
-        public const string BxKnife = "\uef17";
-        public const string Bxl500px = "\ue909";
-        public const string Bxl99designs = "\ue908";
-        public const string BxLabel = "\ueb29";
-        public const string BxlAdobe = "\ue90a";
-        public const string BxlAirbnb = "\ue90b";
-        public const string BxlAlgolia = "\ue90c";
-        public const string BxlAmazon = "\ue90d";
-        public const string BxlAndroid = "\ue90e";
-        public const string BxLandscape = "\ueb2a";
-        public const string BxlAngular = "\ue90f";
-        public const string BxlApple = "\ue910";
-        public const string BxLaptop = "\ueb2b";
-        public const string BxLastPage = "\ueb2c";
-        public const string BxlAudible = "\ue911";
-        public const string BxLaugh = "\ueb2d";
-        public const string BxlAws = "\ue912";
-        public const string BxLayer = "\ueb2e";
-        public const string BxLayerMinus = "\ueb2f";
-        public const string BxLayerPlus = "\ueb30";
-        public const string BxLayout = "\ueb31";
-        public const string BxlBaidu = "\ue913";
-        public const string BxlBehance = "\ue914";
-        public const string BxlBing = "\ue915";
-        public const string BxlBitcoin = "\ue916";
-        public const string BxlBlender = "\ue917";
-        public const string BxlBlogger = "\ue918";
-        public const string BxlBootstrap = "\ue919";
-        public const string BxlChrome = "\ue91a";
-        public const string BxlCodepen = "\ue91b";
-        public const string BxlCPlusPlus = "\ue91c";
-        public const string BxlCreativeCommons = "\ue91d";
-        public const string BxlCss3 = "\ue91e";
-        public const string BxlDailymotion = "\ue91f";
-        public const string BxlDeezer = "\uef3f";
-        public const string BxlDeviantart = "\ue920";
-        public const string BxlDevTo = "\ue921";
-        public const string BxlDigg = "\ue922";
-        public const string BxlDigitalocean = "\ue923";
-        public const string BxlDiscord = "\ue924";
-        public const string BxlDiscordAlt = "\ue925";
-        public const string BxlDiscourse = "\ue926";
-        public const string BxlDjango = "\ue927";
-        public const string BxlDocker = "\ue928";
-        public const string BxlDribbble = "\ue929";
-        public const string BxlDropbox = "\ue92a";
-        public const string BxlDrupal = "\ue92b";
-        public const string BxLeaf = "\ue99a";
-        public const string BxlEbay = "\ue92c";
-        public const string BxlEdge = "\ue92d";
-        public const string BxLeftArrow = "\ueb32";
-        public const string BxLeftArrowAlt = "\ueb33";
-        public const string BxLeftArrowCircle = "\ueb34";
-        public const string BxLeftDownArrowCircle = "\ueb35";
-        public const string BxLeftIndent = "\ueb36";
-        public const string BxLeftTopArrowCircle = "\ueb37";
-        public const string BxLemon = "\uef28";
-        public const string BxlEtsy = "\ue92e";
-        public const string BxlFacebook = "\ue92f";
-        public const string BxlFacebookCircle = "\ue930";
-        public const string BxlFacebookSquare = "\ue931";
-        public const string BxlFigma = "\ue932";
-        public const string BxlFirebase = "\ue933";
-        public const string BxlFirefox = "\ue934";
-        public const string BxlFlask = "\ue907";
-        public const string BxlFlickr = "\ue935";
-        public const string BxlFlickrSquare = "\ue936";
-        public const string BxlFlutter = "\ue937";
-        public const string BxlFoursquare = "\ue938";
-        public const string BxlGit = "\ue939";
-        public const string BxlGithub = "\ue93a";
-        public const string BxlGitlab = "\ue93b";
-        public const string BxlGmail = "\ue906";
-        public const string BxlGoLang = "\ue905";
-        public const string BxlGoogle = "\ue93c";
-        public const string BxlGoogleCloud = "\ue93d";
-        public const string BxlGooglePlus = "\ue93e";
-        public const string BxlGooglePlusCircle = "\ue93f";
-        public const string BxlHeroku = "\ue904";
-        public const string BxlHtml5 = "\ue940";
-        public const string BxLibrary = "\ueb38";
-        public const string BxLike = "\ueb39";
-        public const string BxlImdb = "\ue941";
-        public const string BxLineChart = "\ueb3a";
-        public const string BxLineChartDown = "\ueb3b";
-        public const string BxLink = "\ueb3c";
-        public const string BxLinkAlt = "\ueb3d";
-        public const string BxLinkExternal = "\ueb3e";
-        public const string BxlInstagram = "\ue942";
-        public const string BxlInstagramAlt = "\ue943";
-        public const string BxlInternetExplorer = "\ue944";
-        public const string BxlInvision = "\ue945";
-        public const string BxLira = "\ueb3f";
-        public const string BxListCheck = "\ueb40";
-        public const string BxListMinus = "\ueb41";
-        public const string BxListOl = "\ueb42";
-        public const string BxListPlus = "\ueb43";
-        public const string BxListUl = "\ueb44";
-        public const string BxlJava = "\ue903";
-        public const string BxlJavascript = "\ue946";
-        public const string BxlJoomla = "\ue947";
-        public const string BxlJquery = "\ue948";
-        public const string BxlJsfiddle = "\ue949";
-        public const string BxlKickstarter = "\ue94a";
-        public const string BxlKubernetes = "\ue94b";
-        public const string BxlLess = "\ue94c";
-        public const string BxlLinkedin = "\ue94d";
-        public const string BxlLinkedinSquare = "\ue94e";
-        public const string BxlMagento = "\ue94f";
-        public const string BxlMailchimp = "\ue950";
-        public const string BxlMarkdown = "\ue951";
-        public const string BxlMastercard = "\ue952";
-        public const string BxlMastodon = "\ue953";
-        public const string BxlMedium = "\ue954";
-        public const string BxlMediumOld = "\ue955";
-        public const string BxlMediumSquare = "\ue956";
-        public const string BxlMessenger = "\ue957";
-        public const string BxlMeta = "\uef27";
-        public const string BxlMicrosoft = "\ue958";
-        public const string BxlMicrosoftTeams = "\ue959";
-        public const string BxlMongodb = "\uef3d";
-        public const string BxlNetlify = "\ue902";
-        public const string BxlNodejs = "\ue95a";
-        public const string BxLoader = "\ueb45";
-        public const string BxLoaderAlt = "\ueb46";
-        public const string BxLoaderCircle = "\ueb47";
-        public const string BxLocationPlus = "\ueb48";
-        public const string BxLock = "\ueb49";
-        public const string BxLockAlt = "\ueb4a";
-        public const string BxLockOpen = "\ueb4b";
-        public const string BxLockOpenAlt = "\ueb4c";
-        public const string BxLogIn = "\ueb4d";
-        public const string BxLogInCircle = "\ueb4e";
-        public const string BxLogOut = "\ueb4f";
-        public const string BxLogOutCircle = "\ueb50";
-        public const string BxlOkRu = "\ue95b";
-        public const string BxlOpera = "\ue95c";
-        public const string BxLowVision = "\ueb51";
-        public const string BxlPatreon = "\ue95d";
-        public const string BxlPaypal = "\ue95e";
-        public const string BxlPeriscope = "\ue95f";
-        public const string BxlPhp = "\ue960";
-        public const string BxlPinterest = "\ue961";
-        public const string BxlPinterestAlt = "\ue962";
-        public const string BxlPlayStore = "\ue963";
-        public const string BxlPocket = "\ue964";
-        public const string BxlPostgresql = "\uef3e";
-        public const string BxlProductHunt = "\ue965";
-        public const string BxlPython = "\ue966";
-        public const string BxlQuora = "\ue967";
-        public const string BxlReact = "\ue968";
-        public const string BxlRedbubble = "\ue969";
-        public const string BxlReddit = "\ue96a";
-        public const string BxlRedux = "\ue96b";
-        public const string BxlSass = "\ue96c";
-        public const string BxlShopify = "\ue96d";
-        public const string BxlSketch = "\ue96e";
-        public const string BxlSkype = "\ue96f";
-        public const string BxlSlack = "\ue970";
-        public const string BxlSlackOld = "\ue971";
-        public const string BxlSnapchat = "\ue972";
-        public const string BxlSoundcloud = "\ue973";
-        public const string BxlSpotify = "\ue974";
-        public const string BxlSpringBoot = "\ue975";
-        public const string BxlSquarespace = "\ue976";
-        public const string BxlStackOverflow = "\ue977";
-        public const string BxlSteam = "\ue978";
-        public const string BxlStripe = "\ue979";
-        public const string BxlTailwindCss = "\ue97a";
-        public const string BxlTelegram = "\ue97b";
-        public const string BxlTiktok = "\ue97c";
-        public const string BxlTrello = "\ue97d";
-        public const string BxlTripAdvisor = "\ue97e";
-        public const string BxlTumblr = "\ue97f";
-        public const string BxlTux = "\ue980";
-        public const string BxlTwitch = "\ue981";
-        public const string BxlTwitter = "\ue982";
-        public const string BxlUnity = "\ue983";
-        public const string BxlUnsplash = "\ue984";
-        public const string BxlUpwork = "\ue901";
-        public const string BxlVenmo = "\ue900";
-        public const string BxlVimeo = "\ue985";
-        public const string BxlVisa = "\ue986";
-        public const string BxlVisualStudio = "\ue987";
-        public const string BxlVk = "\ue988";
-        public const string BxlVuejs = "\ue989";
-        public const string BxlWhatsapp = "\ue98a";
-        public const string BxlWhatsappSquare = "\ue98b";
-        public const string BxlWikipedia = "\ue98c";
-        public const string BxlWindows = "\ue98d";
-        public const string BxlWix = "\ue98e";
-        public const string BxlWordpress = "\ue98f";
-        public const string BxlXing = "\uef38";
-        public const string BxlYahoo = "\ue990";
-        public const string BxlYelp = "\ue991";
-        public const string BxlYoutube = "\ue992";
-        public const string BxlZoom = "\ue993";
-        public const string BxMagnet = "\ueb52";
-        public const string BxMailSend = "\ueb53";
-        public const string BxMale = "\ueb54";
-        public const string BxMaleFemale = "\uef24";
-        public const string BxMaleSign = "\ueb55";
-        public const string BxMap = "\ueb56";
-        public const string BxMapAlt = "\ueb57";
-        public const string BxMapPin = "\ueb58";
-        public const string BxMask = "\ueb59";
-        public const string BxMath = "\ue99b";
-        public const string BxMedal = "\ueb5a";
-        public const string BxMeh = "\ueb5b";
-        public const string BxMehAlt = "\ueb5c";
-        public const string BxMehBlank = "\ueb5d";
-        public const string BxMemoryCard = "\ueb5e";
-        public const string BxMenu = "\ueb5f";
-        public const string BxMenuAltLeft = "\ueb60";
-        public const string BxMenuAltRight = "\ueb61";
-        public const string BxMerge = "\ueb62";
-        public const string BxMessage = "\ueb63";
-        public const string BxMessageAdd = "\ueb64";
-        public const string BxMessageAlt = "\ueb65";
-        public const string BxMessageAltAdd = "\ueb66";
-        public const string BxMessageAltCheck = "\ueb67";
-        public const string BxMessageAltDetail = "\ueb68";
-        public const string BxMessageAltDots = "\ueb69";
-        public const string BxMessageAltEdit = "\ueb6a";
-        public const string BxMessageAltError = "\ueb6b";
-        public const string BxMessageAltMinus = "\ueb6c";
-        public const string BxMessageAltX = "\ueb6d";
-        public const string BxMessageCheck = "\ueb6e";
-        public const string BxMessageDetail = "\ueb6f";
-        public const string BxMessageDots = "\ueb70";
-        public const string BxMessageEdit = "\ueb71";
-        public const string BxMessageError = "\ueb72";
-        public const string BxMessageMinus = "\ueb73";
-        public const string BxMessageRounded = "\ueb74";
-        public const string BxMessageRoundedAdd = "\ueb75";
-        public const string BxMessageRoundedCheck = "\ueb76";
-        public const string BxMessageRoundedDetail = "\ueb77";
-        public const string BxMessageRoundedDots = "\ueb78";
-        public const string BxMessageRoundedEdit = "\ueb79";
-        public const string BxMessageRoundedError = "\ueb7a";
-        public const string BxMessageRoundedMinus = "\ueb7b";
-        public const string BxMessageRoundedX = "\ueb7c";
-        public const string BxMessageSquare = "\ueb7d";
-        public const string BxMessageSquareAdd = "\ueb7e";
-        public const string BxMessageSquareCheck = "\ueb7f";
-        public const string BxMessageSquareDetail = "\ueb80";
-        public const string BxMessageSquareDots = "\ueb81";
-        public const string BxMessageSquareEdit = "\ueb82";
-        public const string BxMessageSquareError = "\ueb83";
-        public const string BxMessageSquareMinus = "\ueb84";
-        public const string BxMessageSquareX = "\ueb85";
-        public const string BxMessageX = "\ueb86";
-        public const string BxMeteor = "\ueb87";
-        public const string BxMicrochip = "\ueb88";
-        public const string BxMicrophone = "\ueb89";
-        public const string BxMicrophoneOff = "\ueb8a";
-        public const string BxMinus = "\ueb8b";
-        public const string BxMinusBack = "\ueb8c";
-        public const string BxMinusCircle = "\ueb8d";
-        public const string BxMinusFront = "\ueb8e";
-        public const string BxMobile = "\ueb8f";
-        public const string BxMobileAlt = "\ueb90";
-        public const string BxMobileLandscape = "\ueb91";
-        public const string BxMobileVibration = "\ueb92";
-        public const string BxMoney = "\ueb93";
-        public const string BxMoneyWithdraw = "\uef18";
-        public const string BxMoon = "\ueb94";
-        public const string BxMouse = "\ueb95";
-        public const string BxMouseAlt = "\ueb96";
-        public const string BxMove = "\ueb97";
-        public const string BxMoveHorizontal = "\ueb98";
-        public const string BxMoveVertical = "\ueb99";
-        public const string BxMovie = "\ueb9a";
-        public const string BxMoviePlay = "\ueb9b";
-        public const string BxMusic = "\ueb9c";
-        public const string BxNavigation = "\ueb9d";
-        public const string BxNetworkChart = "\ueb9e";
-        public const string BxNews = "\ueb9f";
-        public const string BxNoEntry = "\ueba0";
-        public const string BxNoSignal = "\uef32";
-        public const string BxNote = "\ueba1";
-        public const string BxNotepad = "\ueba2";
-        public const string BxNotification = "\ueba3";
-        public const string BxNotificationOff = "\ueba4";
-        public const string BxOutline = "\ueba5";
-        public const string BxPackage = "\ueba6";
-        public const string BxPaint = "\ueba7";
-        public const string BxPaintRoll = "\ueba8";
-        public const string BxPalette = "\ueba9";
-        public const string BxPaperclip = "\uebaa";
-        public const string BxPaperPlane = "\uebab";
-        public const string BxParagraph = "\uebac";
-        public const string BxParty = "\ue99c";
-        public const string BxPaste = "\uebad";
-        public const string BxPause = "\uebae";
-        public const string BxPauseCircle = "\uebaf";
-        public const string BxPen = "\uebb0";
-        public const string BxPencil = "\uebb1";
-        public const string BxPhone = "\uebb2";
-        public const string BxPhoneCall = "\uebb3";
-        public const string BxPhoneIncoming = "\uebb4";
-        public const string BxPhoneOff = "\uebb5";
-        public const string BxPhoneOutgoing = "\uebb6";
-        public const string BxPhotoAlbum = "\uebb7";
-        public const string BxPieChart = "\uebb8";
-        public const string BxPieChartAlt = "\uebb9";
-        public const string BxPieChartAlt2 = "\uebba";
-        public const string BxPin = "\uebbb";
-        public const string BxPlanet = "\uebbc";
-        public const string BxPlay = "\uebbd";
-        public const string BxPlayCircle = "\uebbe";
-        public const string BxPlug = "\uebbf";
-        public const string BxPlus = "\uebc0";
-        public const string BxPlusCircle = "\uebc1";
-        public const string BxPlusMedical = "\uebc2";
-        public const string BxPodcast = "\uebc3";
-        public const string BxPointer = "\uebc4";
-        public const string BxPoll = "\uebc5";
-        public const string BxPolygon = "\uebc6";
-        public const string BxPopsicle = "\uef19";
-        public const string BxPound = "\uebc7";
-        public const string BxPowerOff = "\uebc8";
-        public const string BxPrinter = "\uebc9";
-        public const string BxPulse = "\uebca";
-        public const string BxPurchaseTag = "\uebcb";
-        public const string BxPurchaseTagAlt = "\uebcc";
-        public const string BxPyramid = "\uebcd";
-        public const string BxQr = "\uebce";
-        public const string BxQrScan = "\uebcf";
-        public const string BxQuestionMark = "\uebd0";
-        public const string BxRadar = "\uebd1";
-        public const string BxRadio = "\uebd2";
-        public const string BxRadioCircle = "\uebd3";
-        public const string BxRadioCircleMarked = "\uebd4";
-        public const string BxReceipt = "\uebd5";
-        public const string BxRectangle = "\uebd6";
-        public const string BxRecycle = "\uebd7";
-        public const string BxRedo = "\uebd8";
-        public const string BxReflectHorizontal = "\uef3a";
-        public const string BxReflectVertical = "\uef3b";
-        public const string BxRefresh = "\uebd9";
-        public const string BxRegistered = "\uebda";
-        public const string BxRename = "\uebdb";
-        public const string BxRepeat = "\uebdc";
-        public const string BxReply = "\uebdd";
-        public const string BxReplyAll = "\uebde";
-        public const string BxRepost = "\uebdf";
-        public const string BxReset = "\uebe0";
-        public const string BxRestaurant = "\uebe1";
-        public const string BxRevision = "\uebe2";
-        public const string BxRewind = "\uebe3";
-        public const string BxRewindCircle = "\uebe4";
-        public const string BxRightArrow = "\uebe5";
-        public const string BxRightArrowAlt = "\uebe6";
-        public const string BxRightArrowCircle = "\uebe7";
-        public const string BxRightDownArrowCircle = "\uebe8";
-        public const string BxRightIndent = "\uebe9";
-        public const string BxRightTopArrowCircle = "\uebea";
-        public const string BxRocket = "\uebeb";
-        public const string BxRotateLeft = "\uebec";
-        public const string BxRotateRight = "\uebed";
-        public const string BxRss = "\uebee";
-        public const string BxRuble = "\uebef";
-        public const string BxRuler = "\uebf0";
-        public const string BxRun = "\uebf1";
-        public const string BxRupee = "\uebf2";
-        public const string BxSad = "\uebf3";
-        public const string BxsAddToQueue = "\uec99";
-        public const string BxsAdjust = "\uec9a";
-        public const string BxsAdjustAlt = "\uec9b";
-        public const string BxsAlarm = "\uec9c";
-        public const string BxsAlarmAdd = "\uec9d";
-        public const string BxsAlarmExclamation = "\uec9e";
-        public const string BxsAlarmOff = "\uec9f";
-        public const string BxsAlarmSnooze = "\ueca0";
-        public const string BxsAlbum = "\ueca1";
-        public const string BxsAmbulance = "\ueca2";
-        public const string BxsAnalyse = "\ueca3";
-        public const string BxsAngry = "\ueca4";
-        public const string BxsArch = "\ueca5";
-        public const string BxsArchive = "\ueca6";
-        public const string BxsArchiveIn = "\ueca7";
-        public const string BxsArchiveOut = "\ueca8";
-        public const string BxsArea = "\ueca9";
-        public const string BxsArrowFromBottom = "\uecaa";
-        public const string BxsArrowFromLeft = "\uecab";
-        public const string BxsArrowFromRight = "\uecac";
-        public const string BxsArrowFromTop = "\uecad";
-        public const string BxsArrowToBottom = "\uecae";
-        public const string BxsArrowToLeft = "\uecaf";
-        public const string BxsArrowToRight = "\uecb0";
-        public const string BxsArrowToTop = "\uecb1";
-        public const string BxSave = "\uebf4";
-        public const string BxsAward = "\uecb2";
-        public const string BxsBabyCarriage = "\uecb3";
-        public const string BxsBackpack = "\uecb4";
-        public const string BxsBadge = "\uecb5";
-        public const string BxsBadgeCheck = "\uecb6";
-        public const string BxsBadgeDollar = "\uecb7";
-        public const string BxsBaguette = "\uef1b";
-        public const string BxsBall = "\uecb8";
-        public const string BxsBandAid = "\uecb9";
-        public const string BxsBank = "\uecba";
-        public const string BxsBarChartAlt2 = "\uecbb";
-        public const string BxsBarChartSquare = "\uecbc";
-        public const string BxsBarcode = "\uecbd";
-        public const string BxsBaseball = "\uecbe";
-        public const string BxsBasket = "\uecbf";
-        public const string BxsBasketball = "\uecc0";
-        public const string BxsBath = "\uecc1";
-        public const string BxsBattery = "\uecc2";
-        public const string BxsBatteryCharging = "\uecc3";
-        public const string BxsBatteryFull = "\uecc4";
-        public const string BxsBatteryLow = "\uecc5";
-        public const string BxsBed = "\uecc6";
-        public const string BxsBeenHere = "\uecc7";
-        public const string BxsBeer = "\uecc8";
-        public const string BxsBell = "\uecc9";
-        public const string BxsBellMinus = "\uecca";
-        public const string BxsBellOff = "\ueccb";
-        public const string BxsBellPlus = "\ueccc";
-        public const string BxsBellRing = "\ueccd";
-        public const string BxsBible = "\uecce";
-        public const string BxsBinoculars = "\ueccf";
-        public const string BxsBlanket = "\uecd0";
-        public const string BxsBolt = "\uecd1";
-        public const string BxsBoltCircle = "\uecd2";
-        public const string BxsBomb = "\uecd3";
-        public const string BxsBone = "\uecd4";
-        public const string BxsBong = "\uecd5";
-        public const string BxsBook = "\uecd6";
-        public const string BxsBookAdd = "\uecd7";
-        public const string BxsBookAlt = "\uecd8";
-        public const string BxsBookBookmark = "\uecd9";
-        public const string BxsBookContent = "\uecda";
-        public const string BxsBookHeart = "\uecdb";
-        public const string BxsBookmark = "\uecdc";
-        public const string BxsBookmarkAlt = "\uecdd";
-        public const string BxsBookmarkAltMinus = "\uecde";
-        public const string BxsBookmarkAltPlus = "\uecdf";
-        public const string BxsBookmarkHeart = "\uece0";
-        public const string BxsBookmarkMinus = "\uece1";
-        public const string BxsBookmarkPlus = "\uece2";
-        public const string BxsBookmarks = "\uece3";
-        public const string BxsBookmarkStar = "\uece4";
-        public const string BxsBookOpen = "\uece5";
-        public const string BxsBookReader = "\uece6";
-        public const string BxsBot = "\uece7";
-        public const string BxsBowlHot = "\uef1c";
-        public const string BxsBowlingBall = "\uece8";
-        public const string BxsBowlRice = "\uef1d";
-        public const string BxsBox = "\uece9";
-        public const string BxsBrain = "\uecea";
-        public const string BxsBriefcase = "\ueceb";
-        public const string BxsBriefcaseAlt = "\uecec";
-        public const string BxsBriefcaseAlt2 = "\ueced";
-        public const string BxsBrightness = "\uecee";
-        public const string BxsBrightnessHalf = "\uecef";
-        public const string BxsBrush = "\uecf0";
-        public const string BxsBrushAlt = "\uecf1";
-        public const string BxsBug = "\uecf2";
-        public const string BxsBugAlt = "\uecf3";
-        public const string BxsBuilding = "\uecf4";
-        public const string BxsBuildingHouse = "\uecf5";
-        public const string BxsBuildings = "\uecf6";
-        public const string BxsBulb = "\uecf7";
-        public const string BxsBullseye = "\uecf8";
-        public const string BxsBuoy = "\uecf9";
-        public const string BxsBus = "\uecfa";
-        public const string BxsBusiness = "\uecfb";
-        public const string BxsBusSchool = "\uecfc";
-        public const string BxsCabinet = "\uecfd";
-        public const string BxsCableCar = "\uef1e";
-        public const string BxsCake = "\uecfe";
-        public const string BxsCalculator = "\uecff";
-        public const string BxsCalendar = "\ued00";
-        public const string BxsCalendarAlt = "\ued01";
-        public const string BxsCalendarCheck = "\ued02";
-        public const string BxsCalendarEdit = "\ued03";
-        public const string BxsCalendarEvent = "\ued04";
-        public const string BxsCalendarExclamation = "\ued05";
-        public const string BxsCalendarHeart = "\ued06";
-        public const string BxsCalendarMinus = "\ued07";
-        public const string BxsCalendarPlus = "\ued08";
-        public const string BxsCalendarStar = "\ued09";
-        public const string BxsCalendarWeek = "\ued0a";
-        public const string BxsCalendarX = "\ued0b";
-        public const string BxsCamera = "\ued0c";
-        public const string BxsCameraHome = "\ued0d";
-        public const string BxsCameraMovie = "\ued0e";
-        public const string BxsCameraOff = "\ued0f";
-        public const string BxsCameraPlus = "\ued10";
-        public const string BxScan = "\uebf5";
-        public const string BxsCapsule = "\ued11";
-        public const string BxsCaptions = "\ued12";
-        public const string BxsCar = "\ued13";
-        public const string BxsCarBattery = "\ued14";
-        public const string BxsCarCrash = "\ued15";
-        public const string BxsCard = "\ued16";
-        public const string BxsCaretDownCircle = "\ued17";
-        public const string BxsCaretDownSquare = "\ued18";
-        public const string BxsCaretLeftCircle = "\ued19";
-        public const string BxsCaretLeftSquare = "\ued1a";
-        public const string BxsCaretRightCircle = "\ued1b";
-        public const string BxsCaretRightSquare = "\ued1c";
-        public const string BxsCaretUpCircle = "\ued1d";
-        public const string BxsCaretUpSquare = "\ued1e";
-        public const string BxsCarGarage = "\ued1f";
-        public const string BxsCarMechanic = "\ued20";
-        public const string BxsCarousel = "\ued21";
-        public const string BxsCart = "\ued22";
-        public const string BxsCartAdd = "\ued23";
-        public const string BxsCartAlt = "\ued24";
-        public const string BxsCartDownload = "\ued25";
-        public const string BxsCarWash = "\ued26";
-        public const string BxsCat = "\uec95";
-        public const string BxsCategory = "\ued27";
-        public const string BxsCategoryAlt = "\ued28";
-        public const string BxScatterChart = "\uef1a";
-        public const string BxsCctv = "\ued29";
-        public const string BxsCertification = "\ued2a";
-        public const string BxsChalkboard = "\ued2b";
-        public const string BxsChart = "\ued2c";
-        public const string BxsChat = "\ued2d";
-        public const string BxsCheckbox = "\ued2e";
-        public const string BxsCheckboxChecked = "\ued2f";
-        public const string BxsCheckboxMinus = "\ued30";
-        public const string BxsCheckCircle = "\ued31";
-        public const string BxsCheckShield = "\ued32";
-        public const string BxsCheckSquare = "\ued33";
-        public const string BxsCheese = "\uef2c";
-        public const string BxsChess = "\ued34";
-        public const string BxsChevronDown = "\ued35";
-        public const string BxsChevronDownCircle = "\ued36";
-        public const string BxsChevronDownSquare = "\ued37";
-        public const string BxsChevronLeft = "\ued38";
-        public const string BxsChevronLeftCircle = "\ued39";
-        public const string BxsChevronLeftSquare = "\ued3a";
-        public const string BxsChevronRight = "\ued3b";
-        public const string BxsChevronRightCircle = "\ued3c";
-        public const string BxsChevronRightSquare = "\ued3d";
-        public const string BxsChevronsDown = "\ued3e";
-        public const string BxsChevronsLeft = "\ued3f";
-        public const string BxsChevronsRight = "\ued40";
-        public const string BxsChevronsUp = "\ued41";
-        public const string BxsChevronUp = "\ued42";
-        public const string BxsChevronUpCircle = "\ued43";
-        public const string BxsChevronUpSquare = "\ued44";
-        public const string BxsChip = "\ued45";
-        public const string BxsChurch = "\ued46";
-        public const string BxsCircle = "\ued47";
-        public const string BxsCircleHalf = "\uef1f";
-        public const string BxsCircleQuarter = "\uef20";
-        public const string BxsCircleThreeQuarter = "\uef21";
-        public const string BxsCity = "\ued48";
-        public const string BxsClinic = "\ued49";
-        public const string BxsCloud = "\ued4a";
-        public const string BxsCloudDownload = "\ued4b";
-        public const string BxsCloudLightning = "\ued4c";
-        public const string BxsCloudRain = "\ued4d";
-        public const string BxsCloudUpload = "\ued4e";
-        public const string BxsCoffee = "\ued4f";
-        public const string BxsCoffeeAlt = "\ued50";
-        public const string BxsCoffeeTogo = "\ued51";
-        public const string BxsCog = "\ued52";
-        public const string BxsCoin = "\ued53";
-        public const string BxsCoinStack = "\ued54";
-        public const string BxsCollection = "\ued55";
-        public const string BxsColor = "\uef39";
-        public const string BxsColorFill = "\ued56";
-        public const string BxsComment = "\ued57";
-        public const string BxsCommentAdd = "\ued58";
-        public const string BxsCommentCheck = "\ued59";
-        public const string BxsCommentDetail = "\ued5a";
-        public const string BxsCommentDots = "\ued5b";
-        public const string BxsCommentEdit = "\ued5c";
-        public const string BxsCommentError = "\ued5d";
-        public const string BxsCommentMinus = "\ued5e";
-        public const string BxsCommentX = "\ued5f";
-        public const string BxsCompass = "\ued60";
-        public const string BxsComponent = "\ued61";
-        public const string BxsConfused = "\ued62";
-        public const string BxsContact = "\ued63";
-        public const string BxsConversation = "\ued64";
-        public const string BxsCookie = "\ued65";
-        public const string BxsCool = "\ued66";
-        public const string BxsCopy = "\ued67";
-        public const string BxsCopyAlt = "\ued68";
-        public const string BxsCopyright = "\ued69";
-        public const string BxsCoupon = "\ued6a";
-        public const string BxsCreditCard = "\ued6b";
-        public const string BxsCreditCardAlt = "\ued6c";
-        public const string BxsCreditCardFront = "\ued6d";
-        public const string BxScreenshot = "\uebf6";
-        public const string BxsCricketBall = "\uef22";
-        public const string BxsCrop = "\ued6e";
-        public const string BxsCrown = "\ued6f";
-        public const string BxsCube = "\ued70";
-        public const string BxsCubeAlt = "\ued71";
-        public const string BxsCuboid = "\ued72";
-        public const string BxsCustomize = "\ued73";
-        public const string BxsCylinder = "\ued74";
-        public const string BxsDashboard = "\ued75";
-        public const string BxsData = "\ued76";
-        public const string BxsDetail = "\ued77";
-        public const string BxsDevices = "\ued78";
-        public const string BxsDiamond = "\ued79";
-        public const string BxsDice1 = "\ued7a";
-        public const string BxsDice2 = "\ued7b";
-        public const string BxsDice3 = "\ued7c";
-        public const string BxsDice4 = "\ued7d";
-        public const string BxsDice5 = "\ued7e";
-        public const string BxsDice6 = "\ued7f";
-        public const string BxsDirectionLeft = "\ued80";
-        public const string BxsDirectionRight = "\ued81";
-        public const string BxsDirections = "\ued82";
-        public const string BxsDisc = "\ued83";
-        public const string BxsDiscount = "\ued84";
-        public const string BxsDish = "\ued85";
-        public const string BxsDislike = "\ued86";
-        public const string BxsDizzy = "\ued87";
-        public const string BxsDockBottom = "\ued88";
-        public const string BxsDockLeft = "\ued89";
-        public const string BxsDockRight = "\ued8a";
-        public const string BxsDockTop = "\ued8b";
-        public const string BxsDog = "\uec96";
-        public const string BxsDollarCircle = "\ued8c";
-        public const string BxsDonateBlood = "\ued8d";
-        public const string BxsDonateHeart = "\ued8e";
-        public const string BxsDoorOpen = "\ued8f";
-        public const string BxsDoughnutChart = "\ued90";
-        public const string BxsDownArrow = "\ued91";
-        public const string BxsDownArrowAlt = "\ued92";
-        public const string BxsDownArrowCircle = "\ued93";
-        public const string BxsDownArrowSquare = "\ued94";
-        public const string BxsDownload = "\ued95";
-        public const string BxsDownvote = "\ued96";
-        public const string BxsDrink = "\ued97";
-        public const string BxsDroplet = "\uec94";
-        public const string BxsDropletHalf = "\ued98";
-        public const string BxsDryer = "\ued99";
-        public const string BxsDuplicate = "\ued9a";
-        public const string BxSearch = "\uebf7";
-        public const string BxSearchAlt = "\uebf8";
-        public const string BxSearchAlt2 = "\uebf9";
-        public const string BxsEdit = "\ued9b";
-        public const string BxsEditAlt = "\ued9c";
-        public const string BxsEditLocation = "\ued9d";
-        public const string BxsEject = "\ued9e";
-        public const string BxSelection = "\uebfa";
-        public const string BxSelectMultiple = "\uebfb";
-        public const string BxSend = "\uebfc";
-        public const string BxsEnvelope = "\ued9f";
-        public const string BxsEnvelopeOpen = "\ueda0";
-        public const string BxsEraser = "\ueda1";
-        public const string BxsError = "\ueda2";
-        public const string BxsErrorAlt = "\ueda3";
-        public const string BxsErrorCircle = "\ueda4";
-        public const string BxServer = "\uebfd";
-        public const string BxsEvStation = "\ueda5";
-        public const string BxsExit = "\ueda6";
-        public const string BxsExtension = "\ueda7";
-        public const string BxsEyedropper = "\ueda8";
-        public const string BxsFace = "\ueda9";
-        public const string BxsFaceMask = "\uedaa";
-        public const string BxsFactory = "\uedab";
-        public const string BxsFastForwardCircle = "\uedac";
-        public const string BxsFile = "\uedad";
-        public const string BxsFileArchive = "\uedae";
-        public const string BxsFileBlank = "\uedaf";
-        public const string BxsFileCss = "\uedb0";
-        public const string BxsFileDoc = "\uedb1";
-        public const string BxsFileExport = "\uedb2";
-        public const string BxsFileFind = "\uedb3";
-        public const string BxsFileGif = "\uedb4";
-        public const string BxsFileHtml = "\uedb5";
-        public const string BxsFileImage = "\uedb6";
-        public const string BxsFileImport = "\uedb7";
-        public const string BxsFileJpg = "\uedb8";
-        public const string BxsFileJs = "\uedb9";
-        public const string BxsFileJson = "\uedba";
-        public const string BxsFileMd = "\uedbb";
-        public const string BxsFilePdf = "\uedbc";
-        public const string BxsFilePlus = "\uedbd";
-        public const string BxsFilePng = "\uedbe";
-        public const string BxsFileTxt = "\uedbf";
-        public const string BxsFilm = "\uedc0";
-        public const string BxsFilterAlt = "\uedc1";
-        public const string BxsFirstAid = "\uedc2";
-        public const string BxsFlag = "\uedc3";
-        public const string BxsFlagAlt = "\uedc4";
-        public const string BxsFlagCheckered = "\uedc5";
-        public const string BxsFlame = "\uedc6";
-        public const string BxsFlask = "\uedc7";
-        public const string BxsFlorist = "\uedc8";
-        public const string BxsFolder = "\uedc9";
-        public const string BxsFolderMinus = "\uedca";
-        public const string BxsFolderOpen = "\uedcb";
-        public const string BxsFolderPlus = "\uedcc";
-        public const string BxsFoodMenu = "\uedcd";
-        public const string BxsFridge = "\uedce";
-        public const string BxsGame = "\uedcf";
-        public const string BxsGasPump = "\uedd0";
-        public const string BxsGhost = "\uedd1";
-        public const string BxsGift = "\uedd2";
-        public const string BxsGraduation = "\uedd3";
-        public const string BxsGrid = "\uedd4";
-        public const string BxsGridAlt = "\uedd5";
-        public const string BxsGroup = "\uedd6";
-        public const string BxsGuitarAmp = "\uedd7";
-        public const string BxsHand = "\uedd8";
-        public const string BxsHandDown = "\uedd9";
-        public const string BxsHandLeft = "\uedda";
-        public const string BxsHandRight = "\ueddb";
-        public const string BxsHandUp = "\ueddc";
-        public const string BxShapeCircle = "\uebfe";
-        public const string BxShapePolygon = "\uebff";
-        public const string BxShapeSquare = "\uec00";
-        public const string BxShapeTriangle = "\uec01";
-        public const string BxsHappy = "\ueddd";
-        public const string BxsHappyAlt = "\uedde";
-        public const string BxsHappyBeaming = "\ueddf";
-        public const string BxsHappyHeartEyes = "\uede0";
-        public const string BxsHardHat = "\uef2a";
-        public const string BxShare = "\uec02";
-        public const string BxShareAlt = "\uec03";
-        public const string BxsHdd = "\uede1";
-        public const string BxsHeart = "\uede2";
-        public const string BxsHeartCircle = "\uede3";
-        public const string BxsHeartSquare = "\uede4";
-        public const string BxShekel = "\uec04";
-        public const string BxsHelpCircle = "\uede5";
-        public const string BxsHide = "\uede6";
-        public const string BxShield = "\uec05";
-        public const string BxShieldAlt = "\uec06";
-        public const string BxShieldAlt2 = "\uec07";
-        public const string BxShieldQuarter = "\uec08";
-        public const string BxShieldX = "\uec09";
-        public const string BxShocked = "\uec0a";
-        public const string BxsHome = "\uede7";
-        public const string BxsHomeAlt2 = "\uef2b";
-        public const string BxsHomeCircle = "\uede8";
-        public const string BxsHomeHeart = "\uede9";
-        public const string BxsHomeSmile = "\uedea";
-        public const string BxShoppingBag = "\uec0b";
-        public const string BxsHot = "\uec93";
-        public const string BxsHotel = "\uedeb";
-        public const string BxsHourglass = "\uedec";
-        public const string BxsHourglassBottom = "\ueded";
-        public const string BxsHourglassTop = "\uedee";
-        public const string BxShow = "\uec0c";
-        public const string BxShowAlt = "\uec0d";
-        public const string BxShuffle = "\uec0e";
-        public const string BxsIdCard = "\uedef";
-        public const string BxSidebar = "\uec0f";
-        public const string BxSignal1 = "\uef33";
-        public const string BxSignal2 = "\uef34";
-        public const string BxSignal3 = "\uef35";
-        public const string BxSignal4 = "\uef36";
-        public const string BxSignal5 = "\uef37";
-        public const string BxsImage = "\uedf0";
-        public const string BxsImageAdd = "\uedf1";
-        public const string BxsImageAlt = "\uedf2";
-        public const string BxsInbox = "\uedf3";
-        public const string BxsInfoCircle = "\uedf4";
-        public const string BxsInfoSquare = "\uedf5";
-        public const string BxsInjection = "\uec97";
-        public const string BxsInstitution = "\uedf6";
-        public const string BxsInvader = "\uef23";
-        public const string BxSitemap = "\uec10";
-        public const string BxsJoystick = "\uedf7";
-        public const string BxsJoystickAlt = "\uedf8";
-        public const string BxsJoystickButton = "\uedf9";
-        public const string BxsKey = "\uedfa";
-        public const string BxsKeyboard = "\uedfb";
-        public const string BxSkipNext = "\uec11";
-        public const string BxSkipNextCircle = "\uec12";
-        public const string BxSkipPrevious = "\uec13";
-        public const string BxSkipPreviousCircle = "\uec14";
-        public const string BxsLabel = "\uedfc";
-        public const string BxsLandmark = "\uedfd";
-        public const string BxsLandscape = "\uedfe";
-        public const string BxsLaugh = "\uedff";
-        public const string BxsLayer = "\uee00";
-        public const string BxsLayerMinus = "\uee01";
-        public const string BxsLayerPlus = "\uee02";
-        public const string BxsLayout = "\uee03";
-        public const string BxsLeaf = "\uec98";
-        public const string BxSleepy = "\uec15";
-        public const string BxsLeftArrow = "\uee04";
-        public const string BxsLeftArrowAlt = "\uee05";
-        public const string BxsLeftArrowCircle = "\uee06";
-        public const string BxsLeftArrowSquare = "\uee07";
-        public const string BxsLeftDownArrowCircle = "\uee08";
-        public const string BxsLeftTopArrowCircle = "\uee09";
-        public const string BxsLemon = "\uef29";
-        public const string BxSlider = "\uec16";
-        public const string BxSliderAlt = "\uec17";
-        public const string BxSlideshow = "\uec18";
-        public const string BxsLike = "\uee0a";
-        public const string BxsLocationPlus = "\uee0b";
-        public const string BxsLock = "\uee0c";
-        public const string BxsLockAlt = "\uee0d";
-        public const string BxsLockOpen = "\uee0e";
-        public const string BxsLockOpenAlt = "\uee0f";
-        public const string BxsLogIn = "\uee10";
-        public const string BxsLogInCircle = "\uee11";
-        public const string BxsLogOut = "\uee12";
-        public const string BxsLogOutCircle = "\uee13";
-        public const string BxsLowVision = "\uee14";
-        public const string BxsMagicWand = "\uee15";
-        public const string BxsMagnet = "\uee16";
-        public const string BxsMap = "\uee17";
-        public const string BxsMapAlt = "\uee18";
-        public const string BxsMapPin = "\uee19";
-        public const string BxsMask = "\uee1a";
-        public const string BxsMedal = "\uee1b";
-        public const string BxsMegaphone = "\uee1c";
-        public const string BxsMeh = "\uee1d";
-        public const string BxsMehAlt = "\uee1e";
-        public const string BxsMehBlank = "\uee1f";
-        public const string BxsMemoryCard = "\uee20";
-        public const string BxsMessage = "\uee21";
-        public const string BxsMessageAdd = "\uee22";
-        public const string BxsMessageAlt = "\uee23";
-        public const string BxsMessageAltAdd = "\uee24";
-        public const string BxsMessageAltCheck = "\uee25";
-        public const string BxsMessageAltDetail = "\uee26";
-        public const string BxsMessageAltDots = "\uee27";
-        public const string BxsMessageAltEdit = "\uee28";
-        public const string BxsMessageAltError = "\uee29";
-        public const string BxsMessageAltMinus = "\uee2a";
-        public const string BxsMessageAltX = "\uee2b";
-        public const string BxsMessageCheck = "\uee2c";
-        public const string BxsMessageDetail = "\uee2d";
-        public const string BxsMessageDots = "\uee2e";
-        public const string BxsMessageEdit = "\uee2f";
-        public const string BxsMessageError = "\uee30";
-        public const string BxsMessageMinus = "\uee31";
-        public const string BxsMessageRounded = "\uee32";
-        public const string BxsMessageRoundedAdd = "\uee33";
-        public const string BxsMessageRoundedCheck = "\uee34";
-        public const string BxsMessageRoundedDetail = "\uee35";
-        public const string BxsMessageRoundedDots = "\uee36";
-        public const string BxsMessageRoundedEdit = "\uee37";
-        public const string BxsMessageRoundedError = "\uee38";
-        public const string BxsMessageRoundedMinus = "\uee39";
-        public const string BxsMessageRoundedX = "\uee3a";
-        public const string BxsMessageSquare = "\uee3b";
-        public const string BxsMessageSquareAdd = "\uee3c";
-        public const string BxsMessageSquareCheck = "\uee3d";
-        public const string BxsMessageSquareDetail = "\uee3e";
-        public const string BxsMessageSquareDots = "\uee3f";
-        public const string BxsMessageSquareEdit = "\uee40";
-        public const string BxsMessageSquareError = "\uee41";
-        public const string BxsMessageSquareMinus = "\uee42";
-        public const string BxsMessageSquareX = "\uee43";
-        public const string BxsMessageX = "\uee44";
-        public const string BxsMeteor = "\uee45";
-        public const string BxsMicrochip = "\uee46";
-        public const string BxsMicrophone = "\uee47";
-        public const string BxsMicrophoneAlt = "\uee48";
-        public const string BxsMicrophoneOff = "\uee49";
-        public const string BxSmile = "\uec19";
-        public const string BxsMinusCircle = "\uee4a";
-        public const string BxsMinusSquare = "\uee4b";
-        public const string BxsMobile = "\uee4c";
-        public const string BxsMobileVibration = "\uee4d";
-        public const string BxsMoon = "\uee4e";
-        public const string BxsMouse = "\uee4f";
-        public const string BxsMouseAlt = "\uee50";
-        public const string BxsMovie = "\uee51";
-        public const string BxsMoviePlay = "\uee52";
-        public const string BxsMusic = "\uee53";
-        public const string BxsNavigation = "\uee54";
-        public const string BxsNetworkChart = "\uee55";
-        public const string BxsNews = "\uee56";
-        public const string BxsNoEntry = "\uee57";
-        public const string BxsNote = "\uee58";
-        public const string BxsNotepad = "\uee59";
-        public const string BxsNotification = "\uee5a";
-        public const string BxsNotificationOff = "\uee5b";
-        public const string BxsOffer = "\uee5c";
-        public const string BxSort = "\uec1a";
-        public const string BxSortAlt2 = "\uec1b";
-        public const string BxSortAZ = "\uec1c";
-        public const string BxSortDown = "\uec1d";
-        public const string BxSortUp = "\uec1e";
-        public const string BxSortZA = "\uec1f";
-        public const string BxSpa = "\uec20";
-        public const string BxSpaceBar = "\uec21";
-        public const string BxsPackage = "\uee5d";
-        public const string BxsPaint = "\uee5e";
-        public const string BxsPaintRoll = "\uee5f";
-        public const string BxsPalette = "\uee60";
-        public const string BxsPaperPlane = "\uee61";
-        public const string BxsParking = "\uee62";
-        public const string BxsParty = "\uec92";
-        public const string BxsPaste = "\uee63";
-        public const string BxSpeaker = "\uec22";
-        public const string BxsPen = "\uee64";
-        public const string BxsPencil = "\uee65";
-        public const string BxsPhone = "\uee66";
-        public const string BxsPhoneCall = "\uee67";
-        public const string BxsPhoneIncoming = "\uee68";
-        public const string BxsPhoneOff = "\uee69";
-        public const string BxsPhoneOutgoing = "\uee6a";
-        public const string BxsPhotoAlbum = "\uee6b";
-        public const string BxsPiano = "\uee6c";
-        public const string BxsPieChart = "\uee6d";
-        public const string BxsPieChartAlt = "\uee6e";
-        public const string BxsPieChartAlt2 = "\uee6f";
-        public const string BxsPin = "\uee70";
-        public const string BxsPizza = "\uee71";
-        public const string BxsPlane = "\uee72";
-        public const string BxsPlaneAlt = "\uee73";
-        public const string BxsPlaneLand = "\uee74";
-        public const string BxsPlanet = "\uee75";
-        public const string BxsPlaneTakeOff = "\uee76";
-        public const string BxsPlaylist = "\uee77";
-        public const string BxsPlug = "\uee78";
-        public const string BxsPlusCircle = "\uee79";
-        public const string BxsPlusSquare = "\uee7a";
-        public const string BxsPointer = "\uee7b";
-        public const string BxsPolygon = "\uee7c";
-        public const string BxsPopsicle = "\uef25";
-        public const string BxSprayCan = "\uec23";
-        public const string BxSpreadsheet = "\uec24";
-        public const string BxsPrinter = "\uee7d";
-        public const string BxsPurchaseTag = "\uee7e";
-        public const string BxsPurchaseTagAlt = "\uee7f";
-        public const string BxsPyramid = "\uee80";
-        public const string BxSquare = "\uec25";
-        public const string BxSquareRounded = "\uec26";
-        public const string BxsQuoteAltLeft = "\uee81";
-        public const string BxsQuoteAltRight = "\uee82";
-        public const string BxsQuoteLeft = "\uee83";
-        public const string BxsQuoteRight = "\uee84";
-        public const string BxsQuoteSingleLeft = "\uee85";
-        public const string BxsQuoteSingleRight = "\uee86";
-        public const string BxsRadiation = "\uee87";
-        public const string BxsRadio = "\uee88";
-        public const string BxsReceipt = "\uee89";
-        public const string BxsRectangle = "\uee8a";
-        public const string BxsRegistered = "\uee8b";
-        public const string BxsRename = "\uee8c";
-        public const string BxsReport = "\uee8d";
-        public const string BxsRewindCircle = "\uee8e";
-        public const string BxsRightArrow = "\uee8f";
-        public const string BxsRightArrowAlt = "\uee90";
-        public const string BxsRightArrowCircle = "\uee91";
-        public const string BxsRightArrowSquare = "\uee92";
-        public const string BxsRightDownArrowCircle = "\uee93";
-        public const string BxsRightTopArrowCircle = "\uee94";
-        public const string BxsRocket = "\uee95";
-        public const string BxsRuler = "\uee96";
-        public const string BxsSad = "\uee97";
-        public const string BxsSave = "\uee98";
-        public const string BxsSchool = "\uee99";
-        public const string BxsSearch = "\uee9a";
-        public const string BxsSearchAlt2 = "\uee9b";
-        public const string BxsSelectMultiple = "\uee9c";
-        public const string BxsSend = "\uee9d";
-        public const string BxsServer = "\uee9e";
-        public const string BxsShapes = "\uee9f";
-        public const string BxsShare = "\ueea0";
-        public const string BxsShareAlt = "\ueea1";
-        public const string BxsShield = "\ueea2";
-        public const string BxsShieldAlt2 = "\ueea3";
-        public const string BxsShieldX = "\ueea4";
-        public const string BxsShip = "\ueea5";
-        public const string BxsShocked = "\ueea6";
-        public const string BxsShoppingBag = "\ueea7";
-        public const string BxsShoppingBagAlt = "\ueea8";
-        public const string BxsShoppingBags = "\ueea9";
-        public const string BxsShow = "\ueeaa";
-        public const string BxsSkipNextCircle = "\ueeab";
-        public const string BxsSkipPreviousCircle = "\ueeac";
-        public const string BxsSkull = "\ueead";
-        public const string BxsSleepy = "\ueeae";
-        public const string BxsSlideshow = "\ueeaf";
-        public const string BxsSmile = "\ueeb0";
-        public const string BxsSortAlt = "\ueeb1";
-        public const string BxsSpa = "\ueeb2";
-        public const string BxsSpeaker = "\ueeb3";
-        public const string BxsSprayCan = "\ueeb4";
-        public const string BxsSpreadsheet = "\ueeb5";
-        public const string BxsSquare = "\ueeb6";
-        public const string BxsSquareRounded = "\ueeb7";
-        public const string BxsStar = "\ueeb8";
-        public const string BxsStarHalf = "\ueeb9";
-        public const string BxsSticker = "\ueeba";
-        public const string BxsStopwatch = "\ueebb";
-        public const string BxsStore = "\ueebc";
-        public const string BxsStoreAlt = "\ueebd";
-        public const string BxsSun = "\ueebe";
-        public const string BxsTachometer = "\ueebf";
-        public const string BxsTag = "\ueec0";
-        public const string BxsTagAlt = "\ueec1";
-        public const string BxsTagX = "\ueec2";
-        public const string BxStar = "\uec27";
-        public const string BxStation = "\uec28";
-        public const string BxStats = "\uec29";
-        public const string BxsTaxi = "\ueec3";
-        public const string BxsTennisBall = "\ueec4";
-        public const string BxsTerminal = "\ueec5";
-        public const string BxsThermometer = "\ueec6";
-        public const string BxSticker = "\uec2a";
-        public const string BxsTime = "\ueec7";
-        public const string BxsTimeFive = "\ueec8";
-        public const string BxsTimer = "\ueec9";
-        public const string BxsTired = "\ueeca";
-        public const string BxsToggleLeft = "\ueecb";
-        public const string BxsToggleRight = "\ueecc";
-        public const string BxsTone = "\ueecd";
-        public const string BxStop = "\uec2b";
-        public const string BxStopCircle = "\uec2c";
-        public const string BxStopwatch = "\uec2d";
-        public const string BxsTorch = "\ueece";
-        public const string BxStore = "\uec2e";
-        public const string BxStoreAlt = "\uec2f";
-        public const string BxsToTop = "\ueecf";
-        public const string BxsTraffic = "\ueed0";
-        public const string BxsTrafficBarrier = "\ueed1";
-        public const string BxsTrafficCone = "\ueed2";
-        public const string BxsTrain = "\ueed3";
-        public const string BxsTrash = "\ueed4";
-        public const string BxsTrashAlt = "\ueed5";
-        public const string BxsTree = "\ueed6";
-        public const string BxsTreeAlt = "\uef26";
-        public const string BxStreetView = "\uec30";
-        public const string BxStrikethrough = "\uec31";
-        public const string BxsTrophy = "\ueed7";
-        public const string BxsTruck = "\ueed8";
-        public const string BxsTShirt = "\ueed9";
-        public const string BxsTv = "\ueeda";
-        public const string BxSubdirectoryLeft = "\uec32";
-        public const string BxSubdirectoryRight = "\uec33";
-        public const string BxSun = "\uec34";
-        public const string BxsUpArrow = "\ueedb";
-        public const string BxsUpArrowAlt = "\ueedc";
-        public const string BxsUpArrowCircle = "\ueedd";
-        public const string BxsUpArrowSquare = "\ueede";
-        public const string BxSupport = "\uec35";
-        public const string BxsUpsideDown = "\ueedf";
-        public const string BxsUpvote = "\ueee0";
-        public const string BxsUser = "\ueee1";
-        public const string BxsUserAccount = "\ueee2";
-        public const string BxsUserBadge = "\ueee3";
-        public const string BxsUserCheck = "\ueee4";
-        public const string BxsUserCircle = "\ueee5";
-        public const string BxsUserDetail = "\ueee6";
-        public const string BxsUserMinus = "\ueee7";
-        public const string BxsUserPin = "\ueee8";
-        public const string BxsUserPlus = "\ueee9";
-        public const string BxsUserRectangle = "\ueeea";
-        public const string BxsUserVoice = "\ueeeb";
-        public const string BxsUserX = "\ueeec";
-        public const string BxsVector = "\ueeed";
-        public const string BxsVial = "\ueeee";
-        public const string BxsVideo = "\ueeef";
-        public const string BxsVideoOff = "\ueef0";
-        public const string BxsVideoPlus = "\ueef1";
-        public const string BxsVideoRecording = "\ueef2";
-        public const string BxsVideos = "\ueef3";
-        public const string BxsVirus = "\ueef4";
-        public const string BxsVirusBlock = "\ueef5";
-        public const string BxsVolume = "\ueef6";
-        public const string BxsVolumeFull = "\ueef7";
-        public const string BxsVolumeLow = "\ueef8";
-        public const string BxsVolumeMute = "\ueef9";
-        public const string BxsWallet = "\ueefa";
-        public const string BxsWalletAlt = "\ueefb";
-        public const string BxsWasher = "\ueefc";
-        public const string BxsWatch = "\ueefd";
-        public const string BxsWatchAlt = "\ueefe";
-        public const string BxsWebcam = "\ueeff";
-        public const string BxsWidget = "\uef00";
-        public const string BxSwim = "\uec36";
-        public const string BxsWindowAlt = "\uef01";
-        public const string BxsWine = "\uef02";
-        public const string BxsWinkSmile = "\uef03";
-        public const string BxsWinkTongue = "\uef04";
-        public const string BxsWrench = "\uef05";
-        public const string BxsXCircle = "\uef06";
-        public const string BxsXSquare = "\uef07";
-        public const string BxsYinYang = "\uef08";
-        public const string BxSync = "\uec37";
-        public const string BxsZap = "\uef09";
-        public const string BxsZoomIn = "\uef0a";
-        public const string BxsZoomOut = "\uef0b";
-        public const string BxTab = "\uec38";
-        public const string BxTable = "\uec39";
-        public const string BxTachometer = "\uec3a";
-        public const string BxTag = "\uec3b";
-        public const string BxTagAlt = "\uec3c";
-        public const string BxTargetLock = "\uec3d";
-        public const string BxTask = "\uec3e";
-        public const string BxTaskX = "\uec3f";
-        public const string BxTaxi = "\uec40";
-        public const string BxTennisBall = "\uec41";
-        public const string BxTerminal = "\uec42";
-        public const string BxTestTube = "\uec43";
-        public const string BxText = "\uec44";
-        public const string BxTime = "\uec45";
-        public const string BxTimeFive = "\uec46";
-        public const string BxTimer = "\uec47";
-        public const string BxTired = "\uec48";
-        public const string BxToggleLeft = "\uec49";
-        public const string BxToggleRight = "\uec4a";
-        public const string BxTone = "\uec4b";
-        public const string BxTrafficCone = "\uec4c";
-        public const string BxTrain = "\uec4d";
-        public const string BxTransfer = "\uec4e";
-        public const string BxTransferAlt = "\uec4f";
-        public const string BxTrash = "\uec50";
-        public const string BxTrashAlt = "\uec51";
-        public const string BxTrendingDown = "\uec52";
-        public const string BxTrendingUp = "\uec53";
-        public const string BxTrim = "\uec54";
-        public const string BxTrip = "\uec55";
-        public const string BxTrophy = "\uec56";
-        public const string BxTv = "\uec57";
-        public const string BxUnderline = "\uec58";
-        public const string BxUndo = "\uec59";
-        public const string BxUnite = "\uec5a";
-        public const string BxUnlink = "\uec5b";
-        public const string BxUpArrow = "\uec5c";
-        public const string BxUpArrowAlt = "\uec5d";
-        public const string BxUpArrowCircle = "\uec5e";
-        public const string BxUpload = "\uec5f";
-        public const string BxUpsideDown = "\uec60";
-        public const string BxUpvote = "\uec61";
-        public const string BxUsb = "\uec62";
-        public const string BxUser = "\uec63";
-        public const string BxUserCheck = "\uec64";
-        public const string BxUserCircle = "\uec65";
-        public const string BxUserMinus = "\uec66";
-        public const string BxUserPin = "\uec67";
-        public const string BxUserPlus = "\uec68";
-        public const string BxUserVoice = "\uec69";
-        public const string BxUserX = "\uec6a";
-        public const string BxVector = "\uec6b";
-        public const string BxVerticalCenter = "\uec6c";
-        public const string BxVial = "\uec6d";
-        public const string BxVideo = "\uec6e";
-        public const string BxVideoOff = "\uec6f";
-        public const string BxVideoPlus = "\uec70";
-        public const string BxVideoRecording = "\uec71";
-        public const string BxVoicemail = "\uec72";
-        public const string BxVolume = "\uec73";
-        public const string BxVolumeFull = "\uec74";
-        public const string BxVolumeLow = "\uec75";
-        public const string BxVolumeMute = "\uec76";
-        public const string BxWalk = "\uec77";
-        public const string BxWallet = "\uec78";
-        public const string BxWalletAlt = "\uec79";
-        public const string BxWater = "\uec7a";
-        public const string BxWebcam = "\uec7b";
-        public const string BxWifi = "\uec7c";
-        public const string BxWifi0 = "\uec7d";
-        public const string BxWifi1 = "\uec7e";
-        public const string BxWifi2 = "\uec7f";
-        public const string BxWifiOff = "\uec80";
-        public const string BxWind = "\uec81";
-        public const string BxWindow = "\uec82";
-        public const string BxWindowAlt = "\uec83";
-        public const string BxWindowClose = "\uec84";
-        public const string BxWindowOpen = "\uec85";
-        public const string BxWindows = "\uec86";
-        public const string BxWine = "\uec87";
-        public const string BxWinkSmile = "\uec88";
-        public const string BxWinkTongue = "\uec89";
-        public const string BxWon = "\uec8a";
-        public const string BxWorld = "\uec8b";
-        public const string BxWrench = "\uec8c";
-        public const string BxX = "\uec8d";
-        public const string BxXCircle = "\uec8e";
-        public const string BxYen = "\uec8f";
-        public const string BxZoomIn = "\uec90";
-        public const string BxZoomOut = "\uec91";
-    }
-}
\ No newline at end of file
diff --git a/ShrlAlgoToolkit.RevitAddins/Fonts/Font Awesome 6 Free-Regular-400.otf b/ShrlAlgoToolkit.RevitAddins/Fonts/Font Awesome 6 Free-Regular-400.otf
deleted file mode 100644
index 597c320..0000000
Binary files a/ShrlAlgoToolkit.RevitAddins/Fonts/Font Awesome 6 Free-Regular-400.otf and /dev/null differ
diff --git a/ShrlAlgoToolkit.RevitAddins/Fonts/Segoe Fluent Icons.ttf b/ShrlAlgoToolkit.RevitAddins/Fonts/Segoe Fluent Icons.ttf
deleted file mode 100644
index 8f05a4b..0000000
Binary files a/ShrlAlgoToolkit.RevitAddins/Fonts/Segoe Fluent Icons.ttf and /dev/null differ
diff --git a/ShrlAlgoToolkit.RevitAddins/Fonts/boxicons.ttf b/ShrlAlgoToolkit.RevitAddins/Fonts/boxicons.ttf
deleted file mode 100644
index 998f059..0000000
Binary files a/ShrlAlgoToolkit.RevitAddins/Fonts/boxicons.ttf and /dev/null differ
diff --git a/ShrlAlgoToolkit.RevitAddins/GlobalUsings.cs b/ShrlAlgoToolkit.RevitAddins/GlobalUsings.cs
index 42a0711..24151de 100644
--- a/ShrlAlgoToolkit.RevitAddins/GlobalUsings.cs
+++ b/ShrlAlgoToolkit.RevitAddins/GlobalUsings.cs
@@ -1,4 +1,4 @@
 global using Autodesk.Revit.UI;
 global using JetBrains.Annotations;
-global using ShrlAlgoToolkit.Revit.Assists;
-global using ShrlAlgoToolkit.Revit.Extensions;
+global using ShrlAlgoToolkit.RevitCore.Assists;
+global using ShrlAlgoToolkit.RevitCore.Extensions;
diff --git a/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckCmd.cs b/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckCmd.cs
index 5f43e4d..ddbcabb 100644
--- a/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckCmd.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.Attributes;
 
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.ModelManager;
 
@@ -9,5 +9,5 @@ namespace ShrlAlgoToolkit.RevitAddins.ModelManager;
 [UsedImplicitly]
 public class ModelCheckCmd : ExternalCommand
 {
-    public override void Execute() => WinDialogAssist.ShowOrActivate<ModelCheckView, ModelCheckViewModel>(UiApplication);//ModelCheckView view = SingletonViewAssist<ModelCheckView>.GetInstance(out var isNewCreate);//if (isNewCreate)//{//    view.DataContext = new ModelCheckViewModel(uiApplication);//    view.ShowAhead();//}//view.Activate();
+    public override void Execute() => Common.Assists.WinDialogAssist.ShowOrActivate<ModelCheckView, ModelCheckViewModel>(UiApplication);//ModelCheckView view = SingletonViewAssist<ModelCheckView>.GetInstance(out var isNewCreate);//if (isNewCreate)//{//    view.DataContext = new ModelCheckViewModel(uiApplication);//    view.ShowAhead();//}//view.Activate();
 }
\ No newline at end of file
diff --git a/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckViewModel.cs b/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckViewModel.cs
index e707a51..b99e88e 100644
--- a/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckViewModel.cs
@@ -1,15 +1,24 @@
 using System.Collections.ObjectModel;
+using System.IO;
+using System.Windows;
 using System.Windows.Data;
+
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Architecture;
 using Autodesk.Revit.DB.Electrical;
 using Autodesk.Revit.DB.Mechanical;
 using Autodesk.Revit.DB.Plumbing;
+
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+
 using Microsoft.Win32;
+
+using MiniExcelLibs;
+using MiniExcelLibs.OpenXml;
+
 using Nice3point.Revit.Toolkit.External.Handlers;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+
 using ShrlAlgoToolkit.RevitAddins.Windows;
 
 namespace ShrlAlgoToolkit.RevitAddins.ModelManager;
@@ -356,75 +365,150 @@ public partial class ModelCheckViewModel : ObservableObject
 
         try
         {
-            EPPlusHelper.WriteExcel(
-                dialog.FileName,
-                m =>
-                {
-                    var groups = Items.GroupBy(e => e.ErrorMessage);
-                    foreach (var group in groups)
-                    {
-                        var sheet = m.Workbook.Worksheets.Add(group.Key);
-                        //int columns = tdd.NumberOfColumns;
-                        //int rows = group.Count() + 1;
-                        for (var i = -1; i < group.Count(); i++)
-                        {
-                            if (i == -1)
-                            {
-                                sheet.Cells[1, 1].Value = "元素ID";
-                                sheet.Cells[1, 2].Value = "族类别";
-                                sheet.Cells[1, 3].Value = "类型或实例名称";
-                                sheet.Cells[1, 4].Value = "参照标高";
-                                sheet.Cells[1, 5].Value = "系统";
-                                sheet.Cells[1, 6].Value = "主体";
-                                sheet.Cells[1, 7].Value = "房间";
-                            }
-                            else
-                            {
-                                var elem = group.ElementAt(i).Element;
+            var config = new OpenXmlConfiguration()
+            {
+                TableStyles = TableStyles.Default,
+                AutoFilter = true,
+            };
+            Dictionary<string, MessageModel[]> sheets = Items.GroupBy(e => e.ErrorMessage).ToDictionary(g => g.Key, g => g.ToArray());
+            MiniExcel.SaveAs(dialog.FileName, sheets);
 
-                                var type = elem.GetType();
-                                var host = type.GetProperty("Host");
-                                var level = type.GetProperty("ReferenceLevel");
-                                var mepSystem = type.GetProperty("MEPSystem");
-                                var room = type.GetProperty("Room");
-                                sheet.Cells[i + 2, 1].Value = elem.Id.ToString();
-                                sheet.Cells[i + 2, 2].Value = elem.Category.Name;
-                                sheet.Cells[i + 2, 3].Value = elem.Name;
+            //EPPlusHelper.WriteExcel(
+            //    dialog.FileName,
+            //    m =>
+            //    {
+            //        IEnumerable<IGrouping<string, MessageModel>> groups = Items.GroupBy(e => e.ErrorMessage);
+            //        foreach (var group in groups)
+            //        {
+            //            var sheet = m.Workbook.Worksheets.Add(group.Key);
+            //            for (var i = -1; i < group.Count(); i++)
+            //            {
+            //                if (i == -1)
+            //                {
+            //                    sheet.Cells[1, 1].Value = "元素ID";
+            //                    sheet.Cells[1, 2].Value = "族类别";
+            //                    sheet.Cells[1, 3].Value = "类型或实例名称";
+            //                    sheet.Cells[1, 4].Value = "参照标高";
+            //                    sheet.Cells[1, 5].Value = "系统";
+            //                    sheet.Cells[1, 6].Value = "主体";
+            //                    sheet.Cells[1, 7].Value = "房间";
+            //                }
+            //                else
+            //                {
+            //                    var elem = group.ElementAt(i).Element;
 
-                                if (level != null)
-                                {
-                                    sheet.Cells[i + 2, 4].Value = (level.GetValue(elem, null) as Level)?.Name;
-                                }
-                                if (mepSystem != null)
-                                {
-                                    sheet.Cells[i + 2, 5].Value = (mepSystem.GetValue(elem, null) as MEPSystem)?.Name;
-                                }
-                                if (host != null)
-                                {
-                                    sheet.Cells[i + 2, 6].Value = (host.GetValue(elem, null) as Element)?.Name;
-                                }
-                                if (room != null)
-                                {
-                                    sheet.Cells[i + 2, 7].Value = (room.GetValue(room, null) as Room)?.Name;
-                                }
-                            }
-                        }
-                        EPPlusHelper.SetTitle(sheet, 1, 1, 1, 7);
-                        EPPlusHelper.SetStyle(sheet, 2, 1, group.Count() + 1, 7);
+            //                    var type = elem.GetType();
+            //                    var host = type.GetProperty("Host");
+            //                    var level = type.GetProperty("ReferenceLevel");
+            //                    var mepSystem = type.GetProperty("MEPSystem");
+            //                    var room = type.GetProperty("Room");
+            //                    sheet.Cells[i + 2, 1].Value = elem.Id.ToString();
+            //                    sheet.Cells[i + 2, 2].Value = elem.Category.Name;
+            //                    sheet.Cells[i + 2, 3].Value = elem.Name;
 
-                        var range = sheet.Cells[1, 1, group.Count() + 1, 7];
-                        range.AutoFitColumns();
-                    }
-                }
-            );
-            WinDialogAssist.OpenFolderAndSelectFile(dialog.FileName);
+            //                    if (level != null)
+            //                    {
+            //                        sheet.Cells[i + 2, 4].Value = (level.GetValue(elem, null) as Level)?.Name;
+            //                    }
+            //                    if (mepSystem != null)
+            //                    {
+            //                        sheet.Cells[i + 2, 5].Value = (mepSystem.GetValue(elem, null) as MEPSystem)?.Name;
+            //                    }
+            //                    if (host != null)
+            //                    {
+            //                        sheet.Cells[i + 2, 6].Value = (host.GetValue(elem, null) as Element)?.Name;
+            //                    }
+            //                    if (room != null)
+            //                    {
+            //                        sheet.Cells[i + 2, 7].Value = (room.GetValue(room, null) as Room)?.Name;
+            //                    }
+            //                }
+            //            }
+            //            EPPlusHelper.SetTitle(sheet, 1, 1, 1, 7);
+            //            EPPlusHelper.SetStyle(sheet, 2, 1, group.Count() + 1, 7);
+
+            //            var range = sheet.Cells[1, 1, group.Count() + 1, 7];
+            //            range.AutoFitColumns();
+            //        }
+            //    }
+            //);
+            ExportErrorMessageToExcel(dialog.FileName);
+            Common.Assists.WinDialogAssist.OpenFolderAndSelectFile(dialog.FileName);
         }
         catch (Exception ex)
         {
-            Assists.LogAssist.ToLog(ex.Message);
+            Common.Assists.LogAssist.ToLog(ex.Message);
         }
     }
+    private void ExportErrorMessageToExcel(string filePath)
+    {
+        // 1. 准备大字典，用于存放所有 Sheet 数据
+        var allSheetsData = new Dictionary<string, object>();
 
+        // 2. 分组逻辑保持不变
+        IEnumerable<IGrouping<string, MessageModel>> groups = Items.GroupBy(e => e.ErrorMessage);
+
+        foreach (var group in groups)
+        {
+            // 3. 构造当前 Sheet 的行数据列表
+            var sheetRows = new List<Dictionary<string, object>>();
+
+            foreach (var item in group)
+            {
+                var elem = item.Element;
+                if (elem == null) continue;
+
+                var type = elem.GetType();
+
+                // 创建一行数据
+                var row = new Dictionary<string, object>();
+
+                // 直接赋值固定属性
+                row["元素ID"] = elem.Id.ToString();
+                row["族类别"] = elem.Category?.Name ?? "";
+                row["类型或实例名称"] = elem.Name;
+
+                // 使用反射获取动态属性（保留你原有的逻辑）
+                var levelProp = type.GetProperty("ReferenceLevel");
+                var mepProp = type.GetProperty("MEPSystem");
+                var hostProp = type.GetProperty("Host");
+                var roomProp = type.GetProperty("Room");
+
+                row["参照标高"] = levelProp != null ? (levelProp.GetValue(elem, null) as Level)?.Name : "";
+                row["系统"] = mepProp != null ? (mepProp.GetValue(elem, null) as MEPSystem)?.Name : "";
+                row["主体"] = hostProp != null ? (hostProp.GetValue(elem, null) as Element)?.Name : "";
+
+                // 注意：原代码中 room.GetValue(room, null) 应该是 roomProp.GetValue(elem, null) 的笔误
+                row["房间"] = roomProp != null ? (roomProp.GetValue(elem, null) as Room)?.Name : "";
+
+                sheetRows.Add(row);
+            }
+
+            // 4. 处理 Sheet 名称（Excel 限制 31 个字符且不能有特殊字符）
+            string sheetName = group.Key ?? "未命名";
+            char[] invalidChars = { '\\', '/', '?', '*', '[', ']', ':' };
+            foreach (var c in invalidChars) sheetName = sheetName.Replace(c, '_');
+            if (sheetName.Length > 31) sheetName = sheetName.Substring(0, 31);
+
+            // 防止同名 Sheet 冲突
+            if (allSheetsData.ContainsKey(sheetName))
+                sheetName = sheetName.Substring(0, Math.Min(sheetName.Length, 25)) + "_" + Guid.NewGuid().ToString().Substring(0, 4);
+
+            allSheetsData.Add(sheetName, sheetRows);
+        }
+
+        // 5. 保存文件
+        try
+        {
+            // MiniExcel 默认会将 Dictionary 的 Key 作为表头并加粗
+            MiniExcel.SaveAs(filePath, allSheetsData, overwriteFile: true);
+        }
+        catch (IOException)
+        {
+            // 提示文件被占用
+            MessageBox.Show("请先关闭已打开的 Excel 文件后再尝试保存。");
+        }
+    }
     private void FindBasePoint()
     {
         var basePoints = uiapp.ActiveUIDocument.Document.OfClass<BasePoint>().OfType<BasePoint>();
@@ -544,7 +628,7 @@ public partial class ModelCheckViewModel : ObservableObject
             {
                 return;
             }
-            WinDialogAssist.ShowOrActivate<MessageWin, MessageViewModel>(uiapp.ActiveUIDocument, errorItems, "未解决错误");
+            Common.Assists.WinDialogAssist.ShowOrActivate<MessageWin, MessageViewModel>(uiapp.ActiveUIDocument, errorItems, "未解决错误");
         });
     }
 
diff --git a/ShrlAlgoToolkit.RevitAddins/ModelManager/SeparateModelCmd.cs b/ShrlAlgoToolkit.RevitAddins/ModelManager/SeparateModelCmd.cs
index ddf4639..f4bfe8e 100644
--- a/ShrlAlgoToolkit.RevitAddins/ModelManager/SeparateModelCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/ModelManager/SeparateModelCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.ModelManager;
 [Transaction(TransactionMode.Manual)]
@@ -10,6 +10,6 @@ public class SeparateModelCmd : ExternalCommand
     {
         //var win = new SeparateModelWin();
         //win.Show();
-        WinDialogAssist.ShowOrActivate<SeparateModelWin, SeparateModelViewModel>();
+        Common.Assists.WinDialogAssist.ShowOrActivate<SeparateModelWin, SeparateModelViewModel>();
     }
 }
\ No newline at end of file
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesCmd.cs
index 0655f89..52d1d90 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvCivil;
 
@@ -9,6 +9,6 @@ public class BricksFinishesCmd : ExternalCommand
 {
 	public override void Execute()
 	{
-        WinDialogAssist.ShowOrActivate<BricksFinishesView, BricksFinishesViewModel>();
+        Common.Assists.WinDialogAssist.ShowOrActivate<BricksFinishesView, BricksFinishesViewModel>();
 	}
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesViewModel.cs
index 7401119..e5e7c2b 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/BricksFinishesViewModel.cs
@@ -42,8 +42,8 @@ public partial class BricksFinishesViewModel : ObservableValidator
     public partial bool IsEdgeExistGap { get; set; }
 
     [Required(ErrorMessage = "不可为空")]
-    [Attributes.IsNumeric]
-    [Attributes.Minimum(10.0)]
+    [Common.Attributes.IsNumeric]
+    [Common.Attributes.Minimum(10.0)]
     [ObservableProperty]
     [NotifyDataErrorInfo]
     public partial double PavementWidth { get; set; }
@@ -55,7 +55,7 @@ public partial class BricksFinishesViewModel : ObservableValidator
     //}
 
     [Required(ErrorMessage = "不可为空")]
-    [Attributes.IsNumeric]
+    [Common.Attributes.IsNumeric]
     [ObservableProperty]
     [NotifyDataErrorInfo]
     public partial double WallBaseOffset { get; set; }
@@ -67,8 +67,8 @@ public partial class BricksFinishesViewModel : ObservableValidator
     //}
 
     [Required(ErrorMessage = "不可为空")]
-    [Attributes.IsNumeric]
-    [Attributes.Minimum(1.0)]
+    [Common.Attributes.IsNumeric]
+    [Common.Attributes.Minimum(1.0)]
     [ObservableProperty]
     [NotifyDataErrorInfo]
     public partial double PavementThickness { get; set; }
@@ -80,8 +80,8 @@ public partial class BricksFinishesViewModel : ObservableValidator
     //}
 
     [Required(ErrorMessage = "不可为空")]
-    [Attributes.IsNumeric]
-    [Attributes.Minimum(10.0)]
+    [Common.Attributes.IsNumeric]
+    [Common.Attributes.Minimum(10.0)]
     [ObservableProperty]
     [NotifyDataErrorInfo]
     public partial double PavementLength { get; set; }
@@ -93,8 +93,8 @@ public partial class BricksFinishesViewModel : ObservableValidator
     //}
 
     [Required(ErrorMessage = "不可为空")]
-    [Attributes.IsNumeric]
-    [Attributes.Minimum(1.0)]
+    [Common.Attributes.IsNumeric]
+    [Common.Attributes.Minimum(1.0)]
     [ObservableProperty]
     [NotifyDataErrorInfo]
     public partial double PavementGap { get; set; }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCivil/CivilConnectionCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvCivil/CivilConnectionCmd.cs
index 4ad62dc..dc25801 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/CivilConnectionCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/CivilConnectionCmd.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvCivil;
 
@@ -12,7 +12,7 @@ public class CivilConnectionCmd : ExternalCommand
 	{
 		try
 		{
-            WinDialogAssist.ShowModeless<ResolveCivilConnectView>(new ResolveCivilConnectViewModel(UiDocument));
+            Common.Assists.WinDialogAssist.ShowOrActivate<ResolveCivilConnectView, ResolveCivilConnectViewModel>(UiDocument);
 		}
 		catch (Exception ex)
 		{
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsCmd.cs
index 41f2461..8227d0b 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvCivil;
 
@@ -9,7 +9,7 @@ public class CreateOpeningsCmd : ExternalCommand
 {
     public override void Execute()
     {
-        WinDialogAssist.ShowOrActivate<CreateOpeningsView, CreateOpeningsViewModel>();
+        Common.Assists.WinDialogAssist.ShowOrActivate<CreateOpeningsView, CreateOpeningsViewModel>();
     }
 
 
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsViewModel.cs
index 2c4feed..24c9e5c 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsViewModel.cs
@@ -5,7 +5,7 @@ using Autodesk.Revit.UI.Selection;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Nice3point.Revit.Toolkit.External.Handlers;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvCivil
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCivil/FloorFinishesCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvCivil/FloorFinishesCmd.cs
index 8b9e96b..385ff92 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/FloorFinishesCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/FloorFinishesCmd.cs
@@ -2,7 +2,7 @@
 using Autodesk.Revit.DB;
 using Nice3point.Revit.Toolkit.External;
 
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvCivil;
 
@@ -12,6 +12,6 @@ public class FloorFinishesCmd : ExternalCommand
 	public override void Execute()
 	{
 		var floorTypes = Document.OfClass<FloorType>().Cast<FloorType>().ToList();
-        WinDialogAssist.ShowModeless<FloorFinishesView>(new FloorFinishesViewModel(floorTypes));
+        Common.Assists.WinDialogAssist.ShowOrActivate<FloorFinishesView, FloorFinishesViewModel>(floorTypes);
 	}
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectViewModel.cs
index 713b81d..597b86f 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/ResolveCivilConnectViewModel.cs
@@ -4,7 +4,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Nice3point.Revit.Toolkit.External.Handlers;
 
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 using ShrlAlgoToolkit.RevitAddins.Windows;
 
@@ -474,7 +474,7 @@ public partial class ResolveCivilConnectViewModel : ObservableObject
 
 			if (elementsToSkip.Any())
 			{
-                WinDialogAssist.ShowModeless<MessageWin>(new MessageViewModel(uidoc, elementsToSkip, "未解决构件"));
+                Common.Assists.WinDialogAssist.ShowOrActivate<MessageWin, MessageViewModel>(uidoc, elementsToSkip, "未解决构件");
 			}
 			else
 			{
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCivil/SplitComsByLevelCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvCivil/SplitComsByLevelCmd.cs
index 9b228ac..8bff969 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/SplitComsByLevelCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/SplitComsByLevelCmd.cs
@@ -5,7 +5,7 @@ using Autodesk.Revit.DB.IFC;
 
 using Nice3point.Revit.Toolkit.External;
 
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 using ShrlAlgoToolkit.RevitAddins.Windows;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvCivil;
@@ -134,7 +134,7 @@ public class SplitComsByLevelCmd : ExternalCommand
 
         if (errors.Any())
         {
-            WinDialogAssist.ShowModeless<MessageWin>(new MessageViewModel(UiDocument, errors, "未解决错误"));
+            Common.Assists.WinDialogAssist.ShowOrActivate<MessageWin, MessageViewModel>(UiDocument, errors, "未解决错误");
         }
         else
         {
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesCmd.cs
index ebe72e7..52b88f2 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesCmd.cs
@@ -2,7 +2,7 @@
 using Autodesk.Revit.DB;
 using Nice3point.Revit.Toolkit.External;
 
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvCivil
 {
@@ -12,7 +12,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCivil
 		public override void Execute()
 		{
 			var wallTypes = Document.OfCollector().OfClass(typeof(WallType)).Cast<WallType>().ToList();
-            WinDialogAssist.ShowModeless<WallFinishesView>(new WallFinishesViewModel(wallTypes));
+            Common.Assists.WinDialogAssist.ShowOrActivate<WallFinishesView, WallFinishesViewModel>(wallTypes);
 		}
 	}
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesViewModel.cs
index a0d673e..a34d425 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCivil/WallFinishesViewModel.cs
@@ -123,7 +123,7 @@ public partial class WallFinishesViewModel(List<WallType> wallTypes) : Observabl
 				}
 				catch (Exception ex)
 				{
-                    Assists.LogAssist.ToLog(ex.Message);
+                    Common.Assists.LogAssist.ToLog(ex.Message);
 				}
 			},
 			"创建墙面饰面"
@@ -236,7 +236,7 @@ public partial class WallFinishesViewModel(List<WallType> wallTypes) : Observabl
 							}
 							catch (Exception ex)
 							{
-                                Assists.LogAssist.ToLog(ex.Message);
+                                Common.Assists.LogAssist.ToLog(ex.Message);
 							}
 						}
 
@@ -298,7 +298,7 @@ public partial class WallFinishesViewModel(List<WallType> wallTypes) : Observabl
 					}
 					catch (Exception ex)
 					{
-                        Assists.LogAssist.ToLog(ex.Message);
+                        Common.Assists.LogAssist.ToLog(ex.Message);
 					}
 
 					//WallUtils.AllowWallJoinAtEnd(w, 0);
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCommon/DetailSelectFiltersViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvCommon/DetailSelectFiltersViewModel.cs
index ecf4666..66efb89 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCommon/DetailSelectFiltersViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCommon/DetailSelectFiltersViewModel.cs
@@ -21,7 +21,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
         public partial bool IsCutting { get; set; }
 
         [ObservableProperty]
-        public partial ObservableCollection<SelectionElement> Items { get; set; }
+        public partial ObservableCollection<ElementInfo> Items { get; set; }
 
         [ObservableProperty]
         public partial string SearchProp { get; set; }
@@ -46,7 +46,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
                 var element = doc.GetElement(elementId);
                 if (element.IsValidObject)
                 {
-                    Items.Add(new SelectionElement(element));
+                    Items.Add(new ElementInfo(element));
                 }
             }
             FilteredList = CollectionViewSource.GetDefaultView(Items);
@@ -61,7 +61,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
                 {
                     return true;
                 }
-                var item = o as SelectionElement;
+                var item = o as ElementInfo;
                 return (item?.Name != null && item.Name.Contains(SearchProp))
                 || (item?.Number != null && item.Number.Contains(SearchProp))
                 || (item?.Comment != null && item.Comment.Contains(SearchProp));
@@ -71,7 +71,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
         [RelayCommand]
         private void ShowElement(object obj)
         {
-            if (obj is not SelectionElement selection) return;
+            if (obj is not ElementInfo selection) return;
             var model = selection.Element;
             var uidoc = uiapp.ActiveUIDocument;
             if (model.IsValidObject)
@@ -127,7 +127,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
         }
     }
 
-    public class SelectionElement(Element element)
+    public class ElementInfo(Element element)
     {
         public string CategoryName => element.Category?.Name;
 
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCommon/InstanceCreatorCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvCommon/InstanceCreatorCmd.cs
index 4845880..30f7f25 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCommon/InstanceCreatorCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCommon/InstanceCreatorCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvCommon;
 
@@ -12,6 +12,6 @@ public class InstanceCreatorCmd : ExternalCommand
 {
 	public override void Execute()
 	{
-        WinDialogAssist.ShowModeless<InstanceCreatorView>(new InstanceCreatorViewModel(UiDocument));
+        Common.Assists.WinDialogAssist.ShowOrActivate<InstanceCreatorView, InstanceCreatorViewModel>(UiDocument);
 	}
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCommon/InstanceCreatorViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvCommon/InstanceCreatorViewModel.cs
index 25e099c..8f08bb6 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCommon/InstanceCreatorViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCommon/InstanceCreatorViewModel.cs
@@ -6,7 +6,8 @@ using Autodesk.Revit.UI.Selection;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Nice3point.Revit.Toolkit.External.Handlers;
-using ShrlAlgoToolkit.RevitAddins.Extensions;
+
+using ShrlAlgoToolkit.RevitAddins.Common.Extensions;
 
 
 // ReSharper disable ConditionIsAlwaysTrueOrFalse
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCommon/ModelByCurveCreatorCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvCommon/ModelByCurveCreatorCmd.cs
index 430359b..d13f8c8 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCommon/ModelByCurveCreatorCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCommon/ModelByCurveCreatorCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvCommon
 {
@@ -9,7 +9,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
     {
         public override void Execute()
         {
-            WinDialogAssist.ShowModeless<ModelByCurveCreatorView>(new ModelByCurveCreatorViewModel(Document));
+            Common.Assists.WinDialogAssist.ShowOrActivate<ModelByCurveCreatorView, ModelByCurveCreatorViewModel>(Document);
         }
     }
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCommon/ModelByCurveCreatorViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvCommon/ModelByCurveCreatorViewModel.cs
index 9a125fd..6dffcc4 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCommon/ModelByCurveCreatorViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCommon/ModelByCurveCreatorViewModel.cs
@@ -5,7 +5,8 @@ using Autodesk.Revit.UI.Selection;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Nice3point.Revit.Toolkit.External.Handlers;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
+
 
 namespace ShrlAlgoToolkit.RevitAddins.RvCommon
 {
@@ -20,13 +21,13 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
         private readonly ActionEventHandler handler;
 
         [Required(ErrorMessage = "不可为空")]
-        [Attributes.IsNumeric]
+        [Common.Attributes.IsNumeric]
         [ObservableProperty]
         public partial double InstanceOffsetX { get; set; } = 0;
 
         [ObservableProperty]
         [Required(ErrorMessage = "不可为空")]
-        [Attributes.IsNumeric]
+        [Common.Attributes.IsNumeric]
         public partial double InstanceOffsetY { get; set; } = 0;
 
         [ObservableProperty]
@@ -40,18 +41,18 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
         public partial List<Material> Materials { get; set; }
 
         [Required(ErrorMessage = "不可为空")]
-        [Attributes.IsNumeric]
+        [Common.Attributes.IsNumeric]
         [ObservableProperty]
         public partial double OffsetX { get; set; } = 0;
 
         [ObservableProperty]
         [Required(ErrorMessage = "不可为空")]
-        [Attributes.IsNumeric]
+        [Common.Attributes.IsNumeric]
         public partial double OffsetY { get; set; } = 0;
 
         [Required(ErrorMessage = "不可为空")]
-        [Attributes.IsNumeric]
-        [Attributes.Minimum(0.5)]
+        [Common.Attributes.IsNumeric]
+        [Common.Attributes.Minimum(0.5)]
         [ObservableProperty]
         [NotifyDataErrorInfo]
         public partial double Precision { get; set; } = 1.0;
@@ -72,8 +73,8 @@ namespace ShrlAlgoToolkit.RevitAddins.RvCommon
         public partial FamilySymbol SelectedProfileFamilyType { get; set; }
 
         [Required(ErrorMessage = "不可为空")]
-        [Attributes.IsNumeric]
-        [Attributes.Minimum(100)]
+        [Common.Attributes.IsNumeric]
+        [Common.Attributes.Minimum(100)]
         [NotifyDataErrorInfo]
         [ObservableProperty]
         public partial double Spacing { get; set; } = 100;
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorCmd.cs
index b7631a4..9660877 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorCmd.cs
@@ -1,5 +1,5 @@
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvCommon;
 
@@ -9,6 +9,6 @@ public class PipesCreatorCmd : ExternalCommand
 {
 	public override void Execute()
 	{
-        WinDialogAssist.ShowModeless<PipesCreatorView>(new PipesCreatorViewModel(Document));
+        Common.Assists.WinDialogAssist.ShowOrActivate<PipesCreatorView, PipesCreatorViewModel>(Document);
 	}
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorViewModel.cs
index 8d5985e..6cbc981 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvCommon/PipesCreatorViewModel.cs
@@ -238,7 +238,7 @@ public partial class PipesCreatorViewModel : ObservableObject
                 //var filePath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\问题管线.txt";
                 //File.WriteAllText(filePath, sb.ToString());
                 //WinDialogAssist.OpenFolderAndSelectFile(filePath);
-                Assists.LogAssist.WriteTextFile("问题管线", sb.ToString());
+                Common.Assists.LogAssist.WriteTextFile("问题管线", sb.ToString());
             }
 
             //UiDocument.Selection.SetElementIds(ids);
diff --git a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryCmd.cs
index eb96940..1edae59 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary;
 
@@ -9,6 +9,6 @@ public class FamilyLibraryCmd : ExternalCommand
 {
 	public override void Execute()
 	{
-        WinDialogAssist.ShowModeless<FamilyLibraryView>(new FamilyLibraryViewModel());
+        Common.Assists.WinDialogAssist.ShowOrActivate<FamilyLibraryView, FamilyLibraryViewModel>();
     }
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryView.xaml b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryView.xaml
index ece691e..d62852b 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryView.xaml
@@ -40,14 +40,10 @@
             Grid.Row="0"
             Margin="5"
             HorizontalAlignment="Stretch"
+            ui:ControlAssist.Icon="{ui:Icon SymbolValue=Folder}"
             Command="{Binding SelectPathCommand}"
             Content="打开族目录"
-            FontFamily="{StaticResource BoxIcons}"
-            ToolTip="{Binding FamilyPath, Mode=OneWay, StringFormat=族目录：{}{0}}">
-            <ui:ControlAssist.Icon>
-                <ui:IconElement FontFamily="{StaticResource BoxIcons}" Glyph="&#xEADF;" />
-            </ui:ControlAssist.Icon>
-        </Button>
+            ToolTip="{Binding FamilyPath, Mode=OneWay, StringFormat=族目录：{}{0}}" />
         <TreeView
             x:Name="FolderTreeView"
             Grid.Row="1"
@@ -193,17 +189,17 @@
                                 </StackPanel.Style>
                                 <Button
                                     ui:ControlAssist.AppearanceType="Primary"
+                                    ui:ControlAssist.Icon="{ui:Icon SymbolValue=ImportContacts}"
                                     Command="{Binding DataContext.ImportFamilyCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}, Mode=FindAncestor}}"
                                     CommandParameter="{Binding}"
-                                    Content="&#xEDB7;载入"
-                                    FontFamily="{StaticResource BoxIcons}"
+                                    Content="载入"
                                     ToolTip="将族载入到当前项目" />
                                 <Button
                                     ui:ControlAssist.AppearanceType="Primary"
+                                    ui:ControlAssist.Icon="{ui:Icon SymbolValue=LocationChip}"
                                     Command="{Binding DataContext.LocationFamilyFileCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}, Mode=FindAncestor}}"
                                     CommandParameter="{Binding}"
                                     Content="&#xEA90;定位"
-                                    FontFamily="{StaticResource BoxIcons}"
                                     ToolTip="在资源管理器中浏览文件" />
                                 <!--
                                     CommandParameter="{Binding SelectedItem, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}}"
@@ -296,7 +292,7 @@
                 ui:StackPanel.Fill="Auto"
                 Command="{Binding ImportFamilySymbolCommand}"
                 Content="&#xEB1F;"
-                FontFamily="{StaticResource BoxIcons}"
+                ui:ControlAssist.Icon="{ui:Icon SymbolValue=FrontLoader}"
                 ToolTip="载入类型" />
         </ui:StackPanel>
         <TextBlock
diff --git a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryViewModel.cs
index a08b7a0..8cf34cb 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryViewModel.cs
@@ -7,8 +7,8 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using FuzzySharp;
 using Nice3point.Revit.Toolkit.External.Handlers;
-using ShrlAlgoToolkit.RevitAddins.Assists;
-using static ShrlAlgoToolkit.Revit.Assists.RevitFileAssist;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
+using static ShrlAlgoToolkit.RevitCore.Assists.RevitFileAssist;
 using Settings = ShrlAlgoToolkit.RevitAddins.Properties.Settings;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary;
@@ -308,14 +308,9 @@ public partial class FamilyLibraryViewModel : ObservableObject
     [RelayCommand]
     private static void LocationFamilyFile(object obj)
     {
-        //System.Windows.Controls.Button btn = obj as System.Windows.Controls.Button;
         if (obj is FamilyModel familyInfo)
         {
-            var proc = new System.Diagnostics.Process();
-            proc.StartInfo.FileName = "explorer";
-            //打开资源管理器
-            proc.StartInfo.Arguments = "/select," + familyInfo.Path;
-            proc.Start();
+            Common.Assists.WinDialogAssist.OpenFolderAndSelectFile(familyInfo.Path);
         }
     }
 
diff --git a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyModel.cs b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyModel.cs
index e5594cc..46021fd 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyModel.cs
@@ -3,7 +3,7 @@ using System.Windows.Media.Imaging;
 using Autodesk.Revit.DB;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary;
 
@@ -12,7 +12,7 @@ public partial class FamilyModel : ObservableObject
     /// <summary>
     ///     族库缩略图
     /// </summary>
-    public BitmapSource ImageData => Assists.ImageAssist.LoadFileImage(Path, 128, 128);
+    public BitmapSource ImageData => Common.Assists.ImageAssist.LoadFileImage(Path, 128, 128);
 
     /// <summary>
     ///     最近使用面板
diff --git a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyProcessorCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyProcessorCmd.cs
index de9aefa..168ae51 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyProcessorCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyProcessorCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvFamily;
 
@@ -9,6 +9,6 @@ public class FamilyProcessorCmd : ExternalCommand
 {
     public override void Execute()
     {
-        WinDialogAssist.ShowModeless<FamilyProcessorView>(new FamilyProcessorViewModel(UiApplication));
+        Common.Assists.WinDialogAssist.ShowOrActivate<FamilyProcessorView, FamilyProcessorViewModel>(UiApplication);
     }
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyProcessorViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyProcessorViewModel.cs
index 29995ba..08c1871 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyProcessorViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyProcessorViewModel.cs
@@ -6,7 +6,7 @@ using Autodesk.Revit.DB;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Nice3point.Revit.Toolkit.External.Handlers;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvFamily;
 
diff --git a/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyItem.cs b/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyItem.cs
index 184fd0c..77deacb 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyItem.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyItem.cs
@@ -9,7 +9,7 @@ public partial class RenameFamilyItem : ObservableValidator
     public partial bool IsSelected { get; set; }
 
     [ObservableProperty]
-    [Attributes.UndefinedChar]
+    [Common.Attributes.UndefinedChar]
     [NotifyDataErrorInfo]
     public partial string NewFamilyName { get; set; }
 
diff --git a/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyView.xaml b/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyView.xaml
index bbe3879..75516ff 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameFamilyView.xaml
@@ -8,13 +8,13 @@
     x:Class="ShrlAlgoToolkit.RevitAddins.RvFamily.RenameFamilyView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
-    xmlns:conv="clr-namespace:ShrlAlgoToolkit.RevitAddins.Converters"
+    xmlns:conv="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvFamily"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:mvvm="clr-namespace:ShrlAlgoToolkit.RevitAddins.Assists"
+    xmlns:mvvm="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.Assists"
     xmlns:ui="https://github.com/ShrlAlgo/Melskin"
-    xmlns:validationRules="clr-namespace:ShrlAlgoToolkit.Mvvm.ValidationRules"
+    xmlns:validationRules="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.ValidationRules"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Window.Resources>
         <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
diff --git a/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameTypeItem.cs b/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameTypeItem.cs
index 5c50aa4..c53ef59 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameTypeItem.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameTypeItem.cs
@@ -9,7 +9,7 @@ public partial class RenameTypeItem : ObservableValidator
     public partial bool IsSelected { get; set; }
 
     [ObservableProperty]
-    [Attributes.UndefinedChar]
+    [Common.Attributes.UndefinedChar]
     [NotifyDataErrorInfo]
     public partial string NewTypeName { get; set; }
 
diff --git a/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameTypeView.xaml b/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameTypeView.xaml
index a6b185a..5c4ba1d 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameTypeView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvFamily/RenameTypeView.xaml
@@ -2,14 +2,14 @@
     x:Class="ShrlAlgoToolkit.RevitAddins.RvFamily.RenameTypeView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:attach="clr-namespace:ShrlAlgoToolkit.RevitAddins.Assists"
+    xmlns:attach="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.Assists"
     xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
-    xmlns:conv="clr-namespace:ShrlAlgoToolkit.RevitAddins.Converters"
+    xmlns:conv="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvFamily"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="https://github.com/ShrlAlgo/Melskin"
-    xmlns:validationRules="clr-namespace:ShrlAlgoToolkit.Mvvm.ValidationRules"
+    xmlns:validationRules="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.ValidationRules"
     Title="重命名族类型"
     Width="900"
     Height="600"
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/AddInsulationCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/AddInsulationCmd.cs
index 57793b5..fa04c38 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/AddInsulationCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/AddInsulationCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 [Transaction(TransactionMode.Manual)]
@@ -8,6 +8,6 @@ public class AddInsulationCmd : ExternalCommand
 {
     public override void Execute()
     {
-        WinDialogAssist.ShowModeless<AddInsulationView>(new AddInsulationViewModel(Document));
+        Common.Assists.WinDialogAssist.ShowOrActivate<AddInsulationView, AddInsulationViewModel>(Document);
     }
 }
\ No newline at end of file
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/AnyConnectCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/AnyConnectCmd.cs
index 9a4e8bb..759aeed 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/AnyConnectCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/AnyConnectCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 
@@ -9,14 +9,13 @@ public class AnyConnectCmd : ExternalCommand
 {
     public override void Execute()
     {
-        WinDialogAssist.ShowModeless<AnyConnectView>(new AnyConnectViewModel());
 #if REVIT2018
-        //WinDialogAssist.ShowModeless<AnyConnectView>(new AnyConnectViewModel());
+        Common.Assists.WinDialogAssist.ShowOrActivate<AnyConnectView, AnyConnectViewModel>();
 #elif REVIT2020
-        //OptionsBarAssist.RegisterOptionsBar((AutoConnectOptionsView view, AnyConnectViewModel viewModel) =>
-        //{
-        //    viewModel.ConnectCommand.Execute(null);
-        //});
+        OptionsBarAssist.RegisterOptionsBar((AutoConnectOptionsView view, AnyConnectViewModel viewModel) =>
+        {
+            viewModel.ConnectCommand.Execute(null);
+        });
 #endif
     }
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/ArrangeMEPCurveCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/ArrangeMEPCurveCmd.cs
index e07922c..8eabf3e 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/ArrangeMEPCurveCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/ArrangeMEPCurveCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 
@@ -9,6 +9,6 @@ internal class ArrangeMEPCurveCmd : ExternalCommand
 {
     public override void Execute()
     {
-        WinDialogAssist.ShowModeless<ArrangeMEPCurveView>(new ArrangeMEPCurveViewModel());
+        Common.Assists.WinDialogAssist.ShowOrActivate<ArrangeMEPCurveView, ArrangeMEPCurveViewModel>();
     }
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/AutoConnectOptionsView.xaml b/ShrlAlgoToolkit.RevitAddins/RvMEP/AutoConnectOptionsView.xaml
index 223b90f..d100b7b 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/AutoConnectOptionsView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/AutoConnectOptionsView.xaml
@@ -2,7 +2,7 @@
     x:Class="ShrlAlgoToolkit.RevitAddins.RvMEP.AutoConnectOptionsView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="clr-namespace:ShrlAlgoToolkit.RevitAddins.Converters"
+    xmlns:converters="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashReportCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashReportCmd.cs
index 0d903d0..d6c94d8 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashReportCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashReportCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 
@@ -12,6 +12,6 @@ public class ClashReportCmd : ExternalCommand
 {
 	public override void Execute()
 	{
-        WinDialogAssist.ShowModeless<ClashReportView>(new ClashReportViewModel(UiApplication));
+        Common.Assists.WinDialogAssist.ShowOrActivate<ClashReportView, ClashReportViewModel>(UiApplication);
 	}
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveCmd.cs
index 58dad80..9e64740 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 
@@ -11,7 +11,7 @@ public class ClashResolveCmd : ExternalCommand
     {
         try
         {
-            WinDialogAssist.ShowModeless<ClashResolveView>(new ClashResolveViewModel());
+            Common.Assists.WinDialogAssist.ShowOrActivate<ClashResolveView, ClashResolveViewModel>();
         }
         catch (Exception)
         {
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveViewModel.cs
index 91ba216..395f9e4 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/ClashResolveViewModel.cs
@@ -5,7 +5,7 @@ using Autodesk.Revit.UI.Selection;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Nice3point.Revit.Toolkit.External.Handlers;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckCmd.cs
index 9717afe..4b912f7 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckCmd.cs
@@ -5,7 +5,7 @@ using Autodesk.Revit.DB.Mechanical;
 using Autodesk.Revit.DB.Plumbing;
 using Nice3point.Revit.Toolkit.External;
 
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 using ShrlAlgoToolkit.RevitAddins.Windows;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
@@ -114,12 +114,12 @@ public class HeadroomCheckCmd : ExternalCommand
 			viewmodel.Footer = $"最低净高={Math.Round(minHeadroom * 304.8)}mm,元素：{element.Name},Id：{element.Id}";
 			UiDocument.Selection.SetElementIds(new List<ElementId> { element.Id });
 		}
-        WinDialogAssist.ShowModeless<MessageWin>(viewmodel);
+        Common.Assists.WinDialogAssist.ShowModeless<MessageWin>(viewmodel);
 	}
 
 	public override void Execute()
 	{
-        WinDialogAssist.ShowModeless<HeadroomCheckView>(new HeadroomCheckViewModel(UiApplication));
+        Common.Assists.WinDialogAssist.ShowOrActivate<HeadroomCheckView, HeadroomCheckViewModel>(UiApplication);
 		//try
 		//{
 		//    InputMessageBox inputMessage = new("净高限制", "请输出净高要求高度（mm）");
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckView.xaml b/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckView.xaml
index da0ec0a..21f7d00 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/HeadroomCheckView.xaml
@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
-    xmlns:conv="clr-namespace:ShrlAlgoToolkit.RevitAddins.Converters"
+    xmlns:conv="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/InsulationItem.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/InsulationItem.cs
index 5ef25ad..1efb5a0 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/InsulationItem.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/InsulationItem.cs
@@ -6,7 +6,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 public partial class InsulationItem : ObservableValidator
 {
-    [Attributes.GreaterThan(nameof(MinDiameter))]
+    [Common.Attributes.GreaterThan(nameof(MinDiameter))]
     [Range(15, 1000)]
     public double MaxDiameter
     {
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCmd.cs
index 734c121..908e73a 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 
@@ -12,6 +12,6 @@ public class MoveMEPCmd : ExternalCommand
 {
 	public override void Execute()
 	{
-        WinDialogAssist.ShowModeless<MoveMEPCurveView>(new MoveMEPCurveViewModel());
+        Common.Assists.WinDialogAssist.ShowOrActivate<MoveMEPCurveView, MoveMEPCurveViewModel>();
 	}
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCurveViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCurveViewModel.cs
index f88706d..eba7c44 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCurveViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/MoveMEPCurveViewModel.cs
@@ -17,7 +17,7 @@ public partial class MoveMEPCurveViewModel : ObservableValidator
 
     private readonly ActionEventHandler moveHandler = new();
 
-    [Attributes.IsNumeric]
+    [Common.Attributes.IsNumeric]
     [ObservableProperty]
     [NotifyDataErrorInfo]
     public partial double Distance { get; set; }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/RoomCheckItem.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/RoomCheckItem.cs
index 003f2b2..72d00ca 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/RoomCheckItem.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/RoomCheckItem.cs
@@ -1,7 +1,6 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Architecture;
 using CommunityToolkit.Mvvm.ComponentModel;
-using ShrlAlgoToolkit.Core.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP
 {
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/RotateInstanceCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/RotateInstanceCmd.cs
index 6fcee30..fd2058b 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/RotateInstanceCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/RotateInstanceCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP
 {
@@ -9,7 +9,7 @@ namespace ShrlAlgoToolkit.RevitAddins.RvMEP
     {
         public override void Execute()
         {
-            WinDialogAssist.ShowModeless<RotateMEPView>(new RotateMEPViewModel());
+            Common.Assists.WinDialogAssist.ShowOrActivate<RotateMEPView, RotateMEPViewModel>();
         }
     }
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvMEP/StandMepCurveCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvMEP/StandMepCurveCmd.cs
index aa4a997..725956d 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvMEP/StandMepCurveCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvMEP/StandMepCurveCmd.cs
@@ -1,5 +1,5 @@
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvMEP;
 
@@ -9,6 +9,6 @@ public class StandMepCurveCmd : ExternalCommand
 {
 	public override void Execute()
 	{
-        WinDialogAssist.ShowModeless<StandMepCurveView>(new StandMepCurveViewModel(Document));
+        Common.Assists.WinDialogAssist.ShowOrActivate<StandMepCurveView, StandMepCurveViewModel>(Document);
 	}
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/AlignTagsCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvView/AlignTagsCmd.cs
index c070199..58f53f6 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvView/AlignTagsCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/AlignTagsCmd.cs
@@ -1,5 +1,5 @@
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvView;
 
@@ -9,6 +9,6 @@ public class AlignTagsCmd : ExternalCommand
 {
 	public override void Execute()
 	{
-        WinDialogAssist.ShowModeless<AlignTagsView>(new AlignTagsViewModel());
+        Common.Assists.WinDialogAssist.ShowOrActivate<AlignTagsView, AlignTagsViewModel>();
 	}
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/CivilViewFilterCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvView/CivilViewFilterCmd.cs
index f3d8388..7492543 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvView/CivilViewFilterCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/CivilViewFilterCmd.cs
@@ -2,7 +2,8 @@
 using Autodesk.Revit.Attributes;
 using Autodesk.Revit.DB;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvView;
 
@@ -68,7 +69,7 @@ public class CivilViewFilterCmd : ExternalCommand
             catch (Exception e)
             {
                 ErrorMessage = e.Message;
-                Assists.LogAssist.ToLog(e.StackTrace);
+                Common.Assists.LogAssist.ToLog(e.StackTrace);
                 Result = Result.Failed;
                 return;
             }
@@ -112,7 +113,7 @@ public class CivilViewFilterCmd : ExternalCommand
             catch (Exception e)
             {
                 ErrorMessage = e.Message;
-                Assists.LogAssist.ToLog(e.StackTrace);
+                Common.Assists.LogAssist.ToLog(e.StackTrace);
                 Result = Result.Failed;
                 return;
             }
@@ -165,7 +166,7 @@ public class CivilViewFilterCmd : ExternalCommand
             catch (Exception e)
             {
                 ErrorMessage = e.Message;
-                Assists.LogAssist.ToLog(e.StackTrace);
+                Common.Assists.LogAssist.ToLog(e.StackTrace);
                 Result = Result.Failed;
                 return;
             }
@@ -195,7 +196,7 @@ public class CivilViewFilterCmd : ExternalCommand
             catch (Exception e)
             {
                 MessageBox.Show(e.Message);
-                Assists.LogAssist.ToLog(e.StackTrace);
+                Common.Assists.LogAssist.ToLog(e.StackTrace);
             }
 
 #endif
@@ -251,7 +252,7 @@ public class CivilViewFilterCmd : ExternalCommand
                     catch (Exception e)
                     {
                         MessageBox.Show(e.Message);
-                        Assists.LogAssist.ToLog(e.StackTrace);
+                        Common.Assists.LogAssist.ToLog(e.StackTrace);
                     }
 
 #elif REVIT2020 || REVIT2019
diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/ElementsControlCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvView/ElementsControlCmd.cs
index 6120e9b..219dcb9 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvView/ElementsControlCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/ElementsControlCmd.cs
@@ -1,7 +1,8 @@
 
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
+
 
 namespace ShrlAlgoToolkit.RevitAddins.RvView;
 
diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/ExportSchedulesCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvView/ExportSchedulesCmd.cs
index 6a8d6a6..f84d87e 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvView/ExportSchedulesCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/ExportSchedulesCmd.cs
@@ -1,8 +1,16 @@
 using System.IO;
+using System.Windows;
+using System.Windows.Documents;
+
 using Autodesk.Revit.DB;
+
 using Melskin.Controls;
+
+using MiniExcelLibs;
+
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvView;
 
@@ -31,48 +39,74 @@ public class ExportSchedulesCmd : ExternalCommand
         }
 
         var path = $"{selectedPath}\\导出的明细表.xlsx";
+        ExportScheduleToExcel(list, path);
+        Common.Assists.WinDialogAssist.OpenFolderAndSelectFile(path);
+    }
 
-        EPPlusHelper.WriteExcel(
-            path,
-            m =>
+    public void ExportScheduleToExcel(List<ViewSchedule> list,string path)
+    {
+
+        var allSheetsData = new Dictionary<string, object>();
+
+        foreach (var viewSchedule in list)
+        {
+            // 过滤掉无法分配类型的明细表（如修订云线明细表等特殊情况）
+            if (!viewSchedule.CanHaveTypeAssigned()) continue;
+
+            var td = viewSchedule.GetTableData();
+            var tdd = td.GetSectionData(SectionType.Body);
+            var nColumns = tdd.NumberOfColumns;
+            var nRows = tdd.NumberOfRows;
+
+            // 如果明细表连标题行都没有，直接跳过
+            if (nRows == 0) continue;
+
+            // 1. 获取第 0 行作为 Excel 的标题 (Headers)
+            var headers = new List<string>();
+            for (int j = 0; j < nColumns; j++)
             {
-                foreach (var viewSchedule in list)
+                string headerName = viewSchedule.GetCellText(SectionType.Body, 0, j);
+
+                // 容错处理：如果列名为空，给个默认名；如果列名重复，加后缀（MiniExcel要求Key唯一）
+                if (string.IsNullOrWhiteSpace(headerName)) headerName = $"Column_{j + 1}";
+                string uniqueName = headerName;
+                int counter = 1;
+                while (headers.Contains(uniqueName))
                 {
-                    if (!viewSchedule.CanHaveTypeAssigned())
-                    {
-                        continue;
-                    }
-
-                    var sheet = m.Workbook.Worksheets.Add(viewSchedule.Name);
-                    var td = viewSchedule.GetTableData();
-
-                    //TableSectionData tdb = td.GetSectionData(SectionType.Header);
-                    //int hc = tdb.NumberOfColumns;
-                    //int hr = tdb.NumberOfRows;
-                    //for (int i = 0; i < hr; i++)
-                    //{
-                    //    for (int j = 0; j < hc; j++)
-                    //    {
-                    //        //Autodesk.Revit.DB.CellType ctype = tdd.GetCellType(i, j);
-                    //        string str = viewSchedule.GetCellText(SectionType.Header, i, j);
-                    //        sheet.Cells[i + 1, j + 1].Value = str;
-                    //    }
-                    //}
-                    var tdd = td.GetSectionData(SectionType.Body);
-                    var c = tdd.NumberOfColumns;
-                    var r = tdd.NumberOfRows;
-                    for (var i = 0; i < r; i++)
-                    {
-                        for (var j = 0; j < c; j++)
-                        {
-                            sheet.Cells[i + 1, j + 1].Value = viewSchedule.GetCellText(SectionType.Body, i, j);
-                        }
-                    }
-
-                    EPPlusHelper.SetStyle(sheet, 1, sheet.Dimension.Rows, 1, sheet.Dimension.Columns);
+                    uniqueName = $"{headerName}_{counter++}";
                 }
+                headers.Add(uniqueName);
             }
-        );
-        WinDialogAssist.OpenFolderAndSelectFile(path);
+
+            // 2. 构造数据行（从第 1 行开始循环）
+            var rowsData = new List<Dictionary<string, object>>();
+            for (int i = 1; i < nRows; i++)
+            {
+                var row = new Dictionary<string, object>();
+                for (int j = 0; j < nColumns; j++)
+                {
+                    // 使用上面取到的 headers[j] 作为 Key
+                    row[headers[j]] = viewSchedule.GetCellText(SectionType.Body, i, j);
+                }
+                rowsData.Add(row);
+            }
+
+            // 3. 处理 Sheet 名称非法字符 (Excel 不允许 \ / ? * [ ] : )
+            string safeSheetName = viewSchedule.Name;
+            char[] invalidChars = { '\\', '/', '?', '*', '[', ']', ':' };
+            foreach (var c in invalidChars) safeSheetName = safeSheetName.Replace(c, '_');
+            if (safeSheetName.Length > 31) safeSheetName = safeSheetName.Substring(0, 31);
+
+            allSheetsData.Add(safeSheetName, rowsData);
+        }
+        try
+        {
+            MiniExcel.SaveAs(path, allSheetsData, overwriteFile: true);
+        }
+        catch (IOException)
+        {
+            // 提示文件被占用
+            MessageBox.Show("请先关闭已打开的 Excel 文件后再尝试保存。");
+        }
     }
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/QuickViewSectionCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvView/QuickViewSectionCmd.cs
index 27d666b..807318a 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvView/QuickViewSectionCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/QuickViewSectionCmd.cs
@@ -1,5 +1,5 @@
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvView;
 /// <summary>
@@ -13,6 +13,6 @@ public class QuickViewSectionCmd : ExternalCommand
 {
     public override void Execute()
     {
-        WinDialogAssist.ShowModeless<QuickViewSectionView>(new QuickViewSectionViewModel());
+        Common.Assists.WinDialogAssist.ShowOrActivate<QuickViewSectionView, QuickViewSectionViewModel>();
     }
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerCmd.cs
index 5ee756b..999d29c 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerCmd.cs
@@ -1,5 +1,5 @@
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvView;
 
@@ -16,7 +16,7 @@ public class SectionBoxControllerCmd : ExternalCommand
         //}
         try
         {
-            WinDialogAssist.ShowModeless<SectionBoxControllerView>(new SectionBoxControllerViewModel(UiApplication));
+            Common.Assists.WinDialogAssist.ShowOrActivate<SectionBoxControllerView, SectionBoxControllerViewModel>(UiApplication);
         }
         catch (Exception ex)
         {
diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/SystemDisplayView.xaml b/ShrlAlgoToolkit.RevitAddins/RvView/SystemDisplayView.xaml
index e66cb65..e27a37f 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvView/SystemDisplayView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/SystemDisplayView.xaml
@@ -2,7 +2,7 @@
     x:Class="ShrlAlgoToolkit.RevitAddins.RvView.SystemDisplayView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="clr-namespace:ShrlAlgoToolkit.RevitAddins.Converters"
+    xmlns:converters="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerCmd.cs
index 455d05a..c085683 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerCmd.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.Attributes;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvView;
 
@@ -12,6 +12,6 @@ public class ViewManagerCmd : ExternalCommand
 {
 	public override void Execute()
 	{
-        WinDialogAssist.ShowModeless<ViewManagerView>(new ViewManagerViewModel(UiApplication));
+        Common.Assists.WinDialogAssist.ShowOrActivate<ViewManagerView, ViewManagerViewModel>(UiApplication);
 	}
 }
diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerView.xaml b/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerView.xaml
index 0d3abb8..766b2ce 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerView.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerView.xaml
@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
-    xmlns:converters="clr-namespace:ShrlAlgoToolkit.RevitAddins.Converters"
+    xmlns:converters="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerViewModel.cs b/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerViewModel.cs
index c09d5eb..2eac2b1 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerViewModel.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/ViewManagerViewModel.cs
@@ -6,8 +6,9 @@ using Autodesk.Revit.DB;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Nice3point.Revit.Toolkit.External.Handlers;
-using ShrlAlgoToolkit.RevitAddins.Assists;
-using ShrlAlgoToolkit.RevitAddins.Extensions;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Extensions;
+
 
 namespace ShrlAlgoToolkit.RevitAddins.RvView;
 
@@ -184,7 +185,7 @@ public partial class ViewManagerViewModel : ObservableObject
                     }
                     catch (Exception e)
                     {
-                        Assists.LogAssist.ToLog(e.Message);
+                        Common.Assists.LogAssist.ToLog(e.Message);
                     }
                 },
                 "复制视图"
@@ -217,7 +218,7 @@ public partial class ViewManagerViewModel : ObservableObject
                     }
                     catch (Exception e)
                     {
-                        Assists.LogAssist.ToLog(e.Message);
+                        Common.Assists.LogAssist.ToLog(e.Message);
                     }
                 },
                 "复制视图"
@@ -250,7 +251,7 @@ public partial class ViewManagerViewModel : ObservableObject
                     }
                     catch (Exception e)
                     {
-                        Assists.LogAssist.ToLog(e.Message);
+                        Common.Assists.LogAssist.ToLog(e.Message);
                     }
                 },
                 "复制视图"
diff --git a/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityControlCmd.cs b/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityControlCmd.cs
index 32741c5..0c93cac 100644
--- a/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityControlCmd.cs
+++ b/ShrlAlgoToolkit.RevitAddins/RvView/VisibilityControlCmd.cs
@@ -2,7 +2,7 @@
 using Autodesk.Revit.Attributes;
 using Autodesk.Revit.DB;
 using Nice3point.Revit.Toolkit.External;
-using ShrlAlgoToolkit.RevitAddins.Assists;
+using ShrlAlgoToolkit.RevitAddins.Common.Assists;
 
 namespace ShrlAlgoToolkit.RevitAddins.RvView;
 
@@ -16,7 +16,7 @@ public class VisibilityControlCmd : ExternalCommand
     {
         if (Document.ActiveView.ViewTemplateId == ElementId.InvalidElementId)
         {
-            WinDialogAssist.ShowModeless<VisibilityView>(new VisibilityViewModel(UiApplication));
+            Common.Assists.WinDialogAssist.ShowOrActivate<VisibilityView, VisibilityViewModel>(UiApplication);
         }
         else
         {
diff --git a/ShrlAlgoToolkit.RevitAddins/ShrlAlgoToolkit.RevitAddins.csproj b/ShrlAlgoToolkit.RevitAddins/ShrlAlgoToolkit.RevitAddins.csproj
index 2b858b2..323dcc4 100644
--- a/ShrlAlgoToolkit.RevitAddins/ShrlAlgoToolkit.RevitAddins.csproj
+++ b/ShrlAlgoToolkit.RevitAddins/ShrlAlgoToolkit.RevitAddins.csproj
@@ -98,14 +98,14 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>-->
-        <PackageReference Include="EPPlus.Core.Extensions" Version="2.4.0" />
-        <PackageReference Include="ACadSharp" Version="3.3.13" />
+        <PackageReference Include="ACadSharp" Version="3.4.9" />
         <PackageReference Include="FuzzySharp" Version="2.0.2" />
         <PackageReference Include="HtmlAgilityPack" Version="1.12.4" />
         <!--TreatAsUsed="true"标记为已使用-->
         <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" TreatAsUsed="True" />
         <PackageReference Include="Nice3point.Revit.Extensions" Version="2020.3.0" />
         <PackageReference Include="ValueConverters" Version="3.1.22" />
+        <PackageReference Include="MiniExcel" Version="1.42.0" />
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Nice3point.Revit.Api.RevitAPI" Version="$(RevitVersion).*" PrivateAssets="All" />
@@ -142,11 +142,6 @@
     <ItemGroup>
         <ProjectReference Include="..\Melskin\Melskin.csproj" />
     </ItemGroup>
-    <ItemGroup>
-        <Resource Include="Fonts\boxicons.ttf" />
-        <Resource Include="Fonts\Font Awesome 6 Free-Regular-400.otf" />
-        <Resource Include="Fonts\Segoe Fluent Icons.ttf" />
-    </ItemGroup>
 
     <ItemGroup>
         <Compile Update="Properties\Resources.Designer.cs">
@@ -173,8 +168,9 @@
             <LastGenOutput>Settings.Designer.cs</LastGenOutput>
         </None>
     </ItemGroup>
-    
-    <Import Project="..\ShrlAlgoToolkit.Revit\ShrlAlgoToolkit.Revit.projitems" Label="Shared" />
+    <ItemGroup>
+      <Folder Include="Entry\" />
+    </ItemGroup>
 <!--    <PropertyGroup>
         <NeutralLanguage>en</NeutralLanguage>
         <UserSecretsId>c6f7036c-6a5d-453e-9f5e-3089ea23d222</UserSecretsId>
@@ -209,4 +205,6 @@
         <Message Text="[InnoSetup] 打包完成！" Importance="high" />
         <Message Text="------------------------------------------------" Importance="high" />
     </Target>
+
+    <Import Project="..\ShrlAlgoToolkit.RevitCore\ShrlAlgoToolkit.RevitCore.projitems" Label="Shared" />
 </Project>
\ No newline at end of file
diff --git a/ShrlAlgoToolkit.RevitAddins/UIRibbon/FamilyApp.cs b/ShrlAlgoToolkit.RevitAddins/UIRibbon/FamilyApp.cs
index cbc426f..e5c80aa 100644
--- a/ShrlAlgoToolkit.RevitAddins/UIRibbon/FamilyApp.cs
+++ b/ShrlAlgoToolkit.RevitAddins/UIRibbon/FamilyApp.cs
@@ -3,10 +3,11 @@ using System.Reflection;
 using System.Windows;
 using Autodesk.Revit.DB;
 using Autodesk.Windows;
-using ShrlAlgoToolkit.RevitAddins.Extensions;
 using ShrlAlgoToolkit.RevitAddins.Properties;
 using ShrlAlgoToolkit.RevitAddins.RvFamily;
 using ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary;
+using ShrlAlgoToolkit.RevitAddins.Common.Extensions;
+
 
 namespace ShrlAlgoToolkit.RevitAddins.UIRibbon;
 
diff --git a/ShrlAlgoToolkit.RevitAddins/UIRibbon/ModifyTabApp.cs b/ShrlAlgoToolkit.RevitAddins/UIRibbon/ModifyTabApp.cs
index 8dd6a17..d1037e0 100644
--- a/ShrlAlgoToolkit.RevitAddins/UIRibbon/ModifyTabApp.cs
+++ b/ShrlAlgoToolkit.RevitAddins/UIRibbon/ModifyTabApp.cs
@@ -4,10 +4,10 @@ using Autodesk.Revit.DB;
 using Autodesk.Windows;
 using CommunityToolkit.Mvvm.Input;
 using Nice3point.Revit.Toolkit.External.Handlers;
-using ShrlAlgoToolkit.RevitAddins.Assists;
-using ShrlAlgoToolkit.RevitAddins.Extensions;
 using ShrlAlgoToolkit.RevitAddins.Properties;
 using ShrlAlgoToolkit.RevitAddins.RvCommon;
+using ShrlAlgoToolkit.RevitAddins.Common.Extensions;
+
 
 namespace ShrlAlgoToolkit.RevitAddins.UIRibbon;
 
@@ -538,7 +538,7 @@ public class ModifyTabApp
                 IsCheckable = true,
                 Orientation = Orientation.Vertical,
                 CommandHandler = new RelayCommand(
-                     () => WinDialogAssist.ShowModeless<DetailSelectFiltersView>(new DetailSelectFiltersViewModel(uiapp, handler)),
+                     () => Common.Assists.WinDialogAssist.ShowOrActivate<DetailSelectFiltersView, DetailSelectFiltersViewModel>(uiapp, handler),
                     () =>
                         UIDocument?.Selection
                             .GetElementIds()
@@ -591,7 +591,7 @@ public class ModifyTabApp
                 IsCheckable = true,
                 Orientation = Orientation.Vertical,
                 CommandHandler = new RelayCommand(
-                    () => WinDialogAssist.ShowModeless<DetailSelectFiltersView>(new DetailSelectFiltersViewModel(uiapp, handler)),
+                    () => Common.Assists.WinDialogAssist.ShowOrActivate<DetailSelectFiltersView, DetailSelectFiltersViewModel>(uiapp, handler),
                     () =>
                         UIDocument?.Selection
                             .GetElementIds()
diff --git a/ShrlAlgoToolkit.RevitAddins/UIRibbon/TabManagerApp.cs b/ShrlAlgoToolkit.RevitAddins/UIRibbon/TabManagerApp.cs
index b5c118d..5d8d2b2 100644
--- a/ShrlAlgoToolkit.RevitAddins/UIRibbon/TabManagerApp.cs
+++ b/ShrlAlgoToolkit.RevitAddins/UIRibbon/TabManagerApp.cs
@@ -1,6 +1,7 @@
 using Autodesk.Windows;
-using ShrlAlgoToolkit.RevitAddins.Extensions;
 using ShrlAlgoToolkit.RevitAddins.Properties;
+using ShrlAlgoToolkit.RevitAddins.Common.Extensions;
+
 
 namespace ShrlAlgoToolkit.RevitAddins.UIRibbon;
 
diff --git a/ShrlAlgoToolkit.RevitAddins/WPFUI.xaml b/ShrlAlgoToolkit.RevitAddins/WPFUI.xaml
index 09f8214..701e193 100644
--- a/ShrlAlgoToolkit.RevitAddins/WPFUI.xaml
+++ b/ShrlAlgoToolkit.RevitAddins/WPFUI.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="clr-namespace:ShrlAlgoToolkit.RevitAddins.Converters"
+    xmlns:converters="clr-namespace:ShrlAlgoToolkit.RevitAddins.Common.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:familyLibrary="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -14,10 +14,6 @@
         <!--<ui:ThemesDictionary Mode="Light" Palette="Blue"/>
         <ui:ControlsDictionary/>-->
     </ResourceDictionary.MergedDictionaries>
-    <!--#region Fonts-->
-    <FontFamily x:Key="BoxIcons">pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/Fonts/#BoxIcons</FontFamily>
-    <!--<FontFamily x:Key="SourceHanSansSC">pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/Fonts/#Source Han Sans SC</FontFamily>-->
-    <!--#endregion-->
     <DrawingImage x:Key="RevitIcon">
         <DrawingImage.Drawing>
             <DrawingGroup ClipGeometry="M0,0 V1024 H1024 V0 H0 Z">
diff --git a/ShrlAlgoToolkit.RevitAddins/Windows/ProcessEventHandler.cs b/ShrlAlgoToolkit.RevitAddins/Windows/ProcessEventHandler.cs
index 094f7e2..92b301a 100644
--- a/ShrlAlgoToolkit.RevitAddins/Windows/ProcessEventHandler.cs
+++ b/ShrlAlgoToolkit.RevitAddins/Windows/ProcessEventHandler.cs
@@ -71,7 +71,7 @@ namespace ShrlAlgoToolkit.RevitAddins.Windows
                     {
                         ts.RollBack();
                     }
-                    Assists.LogAssist.ToLog(ex.Message);
+                    Common.Assists.LogAssist.ToLog(ex.Message);
                     return;
                 }
                 //await Task.Delay(50);
diff --git a/ShrlAlgoToolkit.Revit/Assists/ColorAssist.cs b/ShrlAlgoToolkit.RevitCore/Assists/ColorAssist.cs
similarity index 98%
rename from ShrlAlgoToolkit.Revit/Assists/ColorAssist.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/ColorAssist.cs
index 5961e7c..c65bfdd 100644
--- a/ShrlAlgoToolkit.Revit/Assists/ColorAssist.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/ColorAssist.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Core.Assists
+namespace ShrlAlgoToolkit.RevitCore.Assists
 {
     public class ColorAssist
     {
diff --git a/ShrlAlgoToolkit.Revit/Assists/DefaultFamilyLoadOptions.cs b/ShrlAlgoToolkit.RevitCore/Assists/DefaultFamilyLoadOptions.cs
similarity index 93%
rename from ShrlAlgoToolkit.Revit/Assists/DefaultFamilyLoadOptions.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/DefaultFamilyLoadOptions.cs
index 7b9f50d..e200fdb 100644
--- a/ShrlAlgoToolkit.Revit/Assists/DefaultFamilyLoadOptions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/DefaultFamilyLoadOptions.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Assists
+namespace ShrlAlgoToolkit.RevitCore.Assists
 {
 	/// <summary>
 	///     载入族，覆盖，只会覆盖类型参数值
diff --git a/ShrlAlgoToolkit.Revit/Assists/DuplicateTypeNamesHandler.cs b/ShrlAlgoToolkit.RevitCore/Assists/DuplicateTypeNamesHandler.cs
similarity index 96%
rename from ShrlAlgoToolkit.Revit/Assists/DuplicateTypeNamesHandler.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/DuplicateTypeNamesHandler.cs
index ed09a51..68649cc 100644
--- a/ShrlAlgoToolkit.Revit/Assists/DuplicateTypeNamesHandler.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/DuplicateTypeNamesHandler.cs
@@ -2,7 +2,7 @@
 
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 /// <summary>
 /// 复制粘贴选项时处理重复类型名称的处理程序。
 /// </summary>
diff --git a/ShrlAlgoToolkit.Revit/Assists/DwgElementSelection.cs b/ShrlAlgoToolkit.RevitCore/Assists/DwgElementSelection.cs
similarity index 97%
rename from ShrlAlgoToolkit.Revit/Assists/DwgElementSelection.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/DwgElementSelection.cs
index 0fb3767..cab9d23 100644
--- a/ShrlAlgoToolkit.Revit/Assists/DwgElementSelection.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/DwgElementSelection.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI.Selection;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 /// <summary>
 /// <c>
diff --git a/ShrlAlgoToolkit.Revit/Assists/ElementInLinkOrCurrentDocument.cs b/ShrlAlgoToolkit.RevitCore/Assists/ElementInLinkOrCurrentDocument.cs
similarity index 96%
rename from ShrlAlgoToolkit.Revit/Assists/ElementInLinkOrCurrentDocument.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/ElementInLinkOrCurrentDocument.cs
index d356c49..ca18265 100644
--- a/ShrlAlgoToolkit.Revit/Assists/ElementInLinkOrCurrentDocument.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/ElementInLinkOrCurrentDocument.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI.Selection;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 /// <summary>
 ///     获取当前模型或链接模型的实体元素
diff --git a/ShrlAlgoToolkit.Revit/Assists/ElementOrientation.cs b/ShrlAlgoToolkit.RevitCore/Assists/ElementOrientation.cs
similarity index 72%
rename from ShrlAlgoToolkit.Revit/Assists/ElementOrientation.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/ElementOrientation.cs
index 8a1e849..337b880 100644
--- a/ShrlAlgoToolkit.Revit/Assists/ElementOrientation.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/ElementOrientation.cs
@@ -1,4 +1,4 @@
-namespace ShrlAlgoToolkit.Revit.Assists
+namespace ShrlAlgoToolkit.RevitCore.Assists
 {
 	public enum ElementOrientation
 	{
diff --git a/ShrlAlgoToolkit.Revit/Assists/EnableInFamilyDocument.cs b/ShrlAlgoToolkit.RevitCore/Assists/EnableInFamilyDocument.cs
similarity index 88%
rename from ShrlAlgoToolkit.Revit/Assists/EnableInFamilyDocument.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/EnableInFamilyDocument.cs
index d363630..ff91e18 100644
--- a/ShrlAlgoToolkit.Revit/Assists/EnableInFamilyDocument.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/EnableInFamilyDocument.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 /// <summary>
 ///     族文档可用
diff --git a/ShrlAlgoToolkit.Revit/Assists/EnableInView3D.cs b/ShrlAlgoToolkit.RevitCore/Assists/EnableInView3D.cs
similarity index 90%
rename from ShrlAlgoToolkit.Revit/Assists/EnableInView3D.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/EnableInView3D.cs
index 7a89eb1..3717a19 100644
--- a/ShrlAlgoToolkit.Revit/Assists/EnableInView3D.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/EnableInView3D.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 /// <summary>
 ///     三维视图可用
diff --git a/ShrlAlgoToolkit.Revit/Assists/EnableInViewPlan.cs b/ShrlAlgoToolkit.RevitCore/Assists/EnableInViewPlan.cs
similarity index 91%
rename from ShrlAlgoToolkit.Revit/Assists/EnableInViewPlan.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/EnableInViewPlan.cs
index 5da896c..ad677aa 100644
--- a/ShrlAlgoToolkit.Revit/Assists/EnableInViewPlan.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/EnableInViewPlan.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 /// <summary>
 ///     命令在平面视图可用
diff --git a/ShrlAlgoToolkit.Revit/Assists/EnableInViewSection.cs b/ShrlAlgoToolkit.RevitCore/Assists/EnableInViewSection.cs
similarity index 90%
rename from ShrlAlgoToolkit.Revit/Assists/EnableInViewSection.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/EnableInViewSection.cs
index 2283735..0ba8906 100644
--- a/ShrlAlgoToolkit.Revit/Assists/EnableInViewSection.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/EnableInViewSection.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 /// <summary>
 ///     命令在剖面、立面可用
diff --git a/ShrlAlgoToolkit.Revit/Assists/EnableInViewSheet.cs b/ShrlAlgoToolkit.RevitCore/Assists/EnableInViewSheet.cs
similarity index 90%
rename from ShrlAlgoToolkit.Revit/Assists/EnableInViewSheet.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/EnableInViewSheet.cs
index 5ca1ab3..000eb3c 100644
--- a/ShrlAlgoToolkit.Revit/Assists/EnableInViewSheet.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/EnableInViewSheet.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 /// <summary>
 ///     图纸视图可用
diff --git a/ShrlAlgoToolkit.Revit/Assists/EncryptParameters.cs b/ShrlAlgoToolkit.RevitCore/Assists/EncryptParameters.cs
similarity index 92%
rename from ShrlAlgoToolkit.Revit/Assists/EncryptParameters.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/EncryptParameters.cs
index b7eb099..bc0084d 100644
--- a/ShrlAlgoToolkit.Revit/Assists/EncryptParameters.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/EncryptParameters.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 public class EncryptParameters
 {
diff --git a/ShrlAlgoToolkit.Revit/Assists/ExtremeWallVariant.cs b/ShrlAlgoToolkit.RevitCore/Assists/ExtremeWallVariant.cs
similarity index 62%
rename from ShrlAlgoToolkit.Revit/Assists/ExtremeWallVariant.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/ExtremeWallVariant.cs
index af533da..e5546d9 100644
--- a/ShrlAlgoToolkit.Revit/Assists/ExtremeWallVariant.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/ExtremeWallVariant.cs
@@ -1,4 +1,4 @@
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 public enum ExtremeWallVariant
 {
diff --git a/ShrlAlgoToolkit.Revit/Assists/FailuresPreProcessor.cs b/ShrlAlgoToolkit.RevitCore/Assists/FailuresPreProcessor.cs
similarity index 96%
rename from ShrlAlgoToolkit.Revit/Assists/FailuresPreProcessor.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/FailuresPreProcessor.cs
index f58a711..855a578 100644
--- a/ShrlAlgoToolkit.Revit/Assists/FailuresPreProcessor.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/FailuresPreProcessor.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Assists
+namespace ShrlAlgoToolkit.RevitCore.Assists
 {
 	/// <summary>
 	///     错误预处理
diff --git a/ShrlAlgoToolkit.Revit/Assists/FailuresPreprocessorHandler.cs b/ShrlAlgoToolkit.RevitCore/Assists/FailuresPreprocessorHandler.cs
similarity index 90%
rename from ShrlAlgoToolkit.Revit/Assists/FailuresPreprocessorHandler.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/FailuresPreprocessorHandler.cs
index 487ade4..91ac9b3 100644
--- a/ShrlAlgoToolkit.Revit/Assists/FailuresPreprocessorHandler.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/FailuresPreprocessorHandler.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Assists
+namespace ShrlAlgoToolkit.RevitCore.Assists
 {
 	public class FailuresPreprocessorHandler : IFailuresPreprocessor
 	{
diff --git a/ShrlAlgoToolkit.Revit/Assists/FuncFilter.cs b/ShrlAlgoToolkit.RevitCore/Assists/FuncFilter.cs
similarity index 91%
rename from ShrlAlgoToolkit.Revit/Assists/FuncFilter.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/FuncFilter.cs
index f5cdca5..af2626a 100644
--- a/ShrlAlgoToolkit.Revit/Assists/FuncFilter.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/FuncFilter.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI.Selection;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 /// <summary>
 /// 任意选择过滤器
diff --git a/ShrlAlgoToolkit.Revit/Assists/FunctionByGuidLine.cs b/ShrlAlgoToolkit.RevitCore/Assists/FunctionByGuidLine.cs
similarity index 98%
rename from ShrlAlgoToolkit.Revit/Assists/FunctionByGuidLine.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/FunctionByGuidLine.cs
index 96585da..4c712dc 100644
--- a/ShrlAlgoToolkit.Revit/Assists/FunctionByGuidLine.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/FunctionByGuidLine.cs
@@ -2,7 +2,7 @@
 using Autodesk.Revit.DB.Events;
 using Autodesk.Revit.UI;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 public class FunctionByGuidLine
 {
diff --git a/ShrlAlgoToolkit.Revit/Assists/GenericFilter.cs b/ShrlAlgoToolkit.RevitCore/Assists/GenericFilter.cs
similarity index 89%
rename from ShrlAlgoToolkit.Revit/Assists/GenericFilter.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/GenericFilter.cs
index 7399053..3c7f7de 100644
--- a/ShrlAlgoToolkit.Revit/Assists/GenericFilter.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/GenericFilter.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI.Selection;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 /// <summary>
 ///     类型过滤
diff --git a/ShrlAlgoToolkit.Revit/Assists/GeometryAssist.cs b/ShrlAlgoToolkit.RevitCore/Assists/GeometryAssist.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Assists/GeometryAssist.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/GeometryAssist.cs
index b90a283..66efaa9 100644
--- a/ShrlAlgoToolkit.Revit/Assists/GeometryAssist.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/GeometryAssist.cs
@@ -2,7 +2,7 @@
 
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Assists
+namespace ShrlAlgoToolkit.RevitCore.Assists
 {
     public class GeometryAssist
     {
diff --git a/ShrlAlgoToolkit.Revit/Assists/HasActiveDocument.cs b/ShrlAlgoToolkit.RevitCore/Assists/HasActiveDocument.cs
similarity index 87%
rename from ShrlAlgoToolkit.Revit/Assists/HasActiveDocument.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/HasActiveDocument.cs
index ca38829..68d9dc4 100644
--- a/ShrlAlgoToolkit.Revit/Assists/HasActiveDocument.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/HasActiveDocument.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 /// <summary>
 /// 已经打开文档
 /// </summary>
diff --git a/ShrlAlgoToolkit.Revit/Assists/KeyIntPtrHelper.cs b/ShrlAlgoToolkit.RevitCore/Assists/KeyIntPtrHelper.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Assists/KeyIntPtrHelper.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/KeyIntPtrHelper.cs
index cf92adb..60a711a 100644
--- a/ShrlAlgoToolkit.Revit/Assists/KeyIntPtrHelper.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/KeyIntPtrHelper.cs
@@ -5,7 +5,7 @@ using System.Windows;
 using System.Windows.Interop;
 using Autodesk.Windows;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 public class KeyIntPtrHelper
 {
diff --git a/ShrlAlgoToolkit.Revit/Assists/KeyboardShortcutService.cs b/ShrlAlgoToolkit.RevitCore/Assists/KeyboardShortcutService.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Assists/KeyboardShortcutService.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/KeyboardShortcutService.cs
index fe41179..07b22f3 100644
--- a/ShrlAlgoToolkit.Revit/Assists/KeyboardShortcutService.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/KeyboardShortcutService.cs
@@ -3,7 +3,7 @@ using Autodesk.Revit.UI;
 using UIFramework;
 using UIFrameworkServices;
 
-namespace ShrlAlgoToolkit.Revit.Assists
+namespace ShrlAlgoToolkit.RevitCore.Assists
 {
     /// <summary>
     /// 通过命令id设置快捷键
diff --git a/ShrlAlgoToolkit.Revit/Assists/NativeModule.cs b/ShrlAlgoToolkit.RevitCore/Assists/NativeModule.cs
similarity index 96%
rename from ShrlAlgoToolkit.Revit/Assists/NativeModule.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/NativeModule.cs
index e1c38a3..5f629b5 100644
--- a/ShrlAlgoToolkit.Revit/Assists/NativeModule.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/NativeModule.cs
@@ -4,7 +4,7 @@ using Autodesk.Revit.UI;
 
 using System.Reflection;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 public class NativeModule
 {
diff --git a/ShrlAlgoToolkit.Revit/Assists/OnProjectDocument.cs b/ShrlAlgoToolkit.RevitCore/Assists/OnProjectDocument.cs
similarity index 90%
rename from ShrlAlgoToolkit.Revit/Assists/OnProjectDocument.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/OnProjectDocument.cs
index fa55870..658dca2 100644
--- a/ShrlAlgoToolkit.Revit/Assists/OnProjectDocument.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/OnProjectDocument.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 /// <summary>
 /// 项目文档可用
diff --git a/ShrlAlgoToolkit.Revit/Assists/OptionsBarAssist.cs b/ShrlAlgoToolkit.RevitCore/Assists/OptionsBarAssist.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Assists/OptionsBarAssist.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/OptionsBarAssist.cs
index 631b6de..42e87be 100644
--- a/ShrlAlgoToolkit.Revit/Assists/OptionsBarAssist.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/OptionsBarAssist.cs
@@ -3,7 +3,7 @@ using System.Windows.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
 using UIFramework;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 #if REVIT2020||REVIT2025
 public static class OptionsBarAssist
diff --git a/ShrlAlgoToolkit.Revit/Assists/ParameterAssist.cs b/ShrlAlgoToolkit.RevitCore/Assists/ParameterAssist.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Assists/ParameterAssist.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/ParameterAssist.cs
index c3d6785..1e3c61c 100644
--- a/ShrlAlgoToolkit.Revit/Assists/ParameterAssist.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/ParameterAssist.cs
@@ -5,9 +5,9 @@ using System.Reflection;
 using Autodesk.Revit.ApplicationServices;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
-using ShrlAlgoToolkit.Revit.Extensions;
+using ShrlAlgoToolkit.RevitCore.Extensions;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 public class ParameterAssist
 {
diff --git a/ShrlAlgoToolkit.Revit/Assists/PublishAssist.cs b/ShrlAlgoToolkit.RevitCore/Assists/PublishAssist.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Assists/PublishAssist.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/PublishAssist.cs
index 1161496..878983a 100644
--- a/ShrlAlgoToolkit.Revit/Assists/PublishAssist.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/PublishAssist.cs
@@ -13,7 +13,7 @@ using Org.BouncyCastle.OpenSsl;
 using OpenMcdf;
 using System.Windows;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 public class PublishAssist
 {
diff --git a/ShrlAlgoToolkit.Revit/Assists/RevitCommandEndedMonitor.cs b/ShrlAlgoToolkit.RevitCore/Assists/RevitCommandEndedMonitor.cs
similarity index 97%
rename from ShrlAlgoToolkit.Revit/Assists/RevitCommandEndedMonitor.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/RevitCommandEndedMonitor.cs
index b459925..c0f6188 100644
--- a/ShrlAlgoToolkit.Revit/Assists/RevitCommandEndedMonitor.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/RevitCommandEndedMonitor.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Events;
 
-namespace ShrlAlgoToolkit.Revit.Assists
+namespace ShrlAlgoToolkit.RevitCore.Assists
 {
     /// <summary>
     /// UiApplication.PostCommand 结束事件监视器
diff --git a/ShrlAlgoToolkit.Revit/Assists/RevitFileAssist.cs b/ShrlAlgoToolkit.RevitCore/Assists/RevitFileAssist.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Assists/RevitFileAssist.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/RevitFileAssist.cs
index 1ed19b5..a9b2fea 100644
--- a/ShrlAlgoToolkit.Revit/Assists/RevitFileAssist.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/RevitFileAssist.cs
@@ -7,7 +7,7 @@ using System.Text;
 using System.Windows.Media.Imaging;
 using System.Xml;
 
-namespace ShrlAlgoToolkit.Revit.Assists
+namespace ShrlAlgoToolkit.RevitCore.Assists
 {
     /// <summary>
     ///     直接读取文件的信息（不依赖RevitAPI）
diff --git a/ShrlAlgoToolkit.Revit/Assists/RevitIniAssist.cs b/ShrlAlgoToolkit.RevitCore/Assists/RevitIniAssist.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Assists/RevitIniAssist.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/RevitIniAssist.cs
index 3efb7d7..2fb326a 100644
--- a/ShrlAlgoToolkit.Revit/Assists/RevitIniAssist.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/RevitIniAssist.cs
@@ -47,7 +47,7 @@
 using System.IO;
 using System.Text;
 
-namespace ShrlAlgoToolkit.Revit.Assists
+namespace ShrlAlgoToolkit.RevitCore.Assists
 {
 	public static class RevitIniAssist
 	{
diff --git a/ShrlAlgoToolkit.Revit/Assists/ShortcutRepAttribute.cs b/ShrlAlgoToolkit.RevitCore/Assists/ShortcutRepAttribute.cs
similarity index 87%
rename from ShrlAlgoToolkit.Revit/Assists/ShortcutRepAttribute.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/ShortcutRepAttribute.cs
index 0f945bc..63c2a40 100644
--- a/ShrlAlgoToolkit.Revit/Assists/ShortcutRepAttribute.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/ShortcutRepAttribute.cs
@@ -1,4 +1,4 @@
-namespace ShrlAlgoToolkit.Revit.Assists
+namespace ShrlAlgoToolkit.RevitCore.Assists
 {
     /// <summary>
     /// 多个快捷键使用#分割
diff --git a/ShrlAlgoToolkit.Revit/Assists/SpatialAssist.cs b/ShrlAlgoToolkit.RevitCore/Assists/SpatialAssist.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Assists/SpatialAssist.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/SpatialAssist.cs
index f78afc8..141fae9 100644
--- a/ShrlAlgoToolkit.Revit/Assists/SpatialAssist.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/SpatialAssist.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
-using ShrlAlgoToolkit.Revit.Extensions;
+using ShrlAlgoToolkit.RevitCore.Extensions;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 public static class SpatialAssist
 {
diff --git a/ShrlAlgoToolkit.Revit/Assists/StatusBarAssist.cs b/ShrlAlgoToolkit.RevitCore/Assists/StatusBarAssist.cs
similarity index 95%
rename from ShrlAlgoToolkit.Revit/Assists/StatusBarAssist.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/StatusBarAssist.cs
index 89e6ce1..a8a1668 100644
--- a/ShrlAlgoToolkit.Revit/Assists/StatusBarAssist.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/StatusBarAssist.cs
@@ -1,4 +1,4 @@
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 public class StatusBarAssist
 {
diff --git a/ShrlAlgoToolkit.Revit/Assists/UIAssist.cs b/ShrlAlgoToolkit.RevitCore/Assists/UIAssist.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Assists/UIAssist.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/UIAssist.cs
index 34a1ad5..32954ed 100644
--- a/ShrlAlgoToolkit.Revit/Assists/UIAssist.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/UIAssist.cs
@@ -12,7 +12,7 @@ using Autodesk.Revit.UI;
 
 using adWin = Autodesk.Windows;
 
-namespace ShrlAlgoToolkit.Revit.Assists
+namespace ShrlAlgoToolkit.RevitCore.Assists
 {
     public class UIAssist
     {
diff --git a/ShrlAlgoToolkit.Revit/Assists/Updater.cs b/ShrlAlgoToolkit.RevitCore/Assists/Updater.cs
similarity index 98%
rename from ShrlAlgoToolkit.Revit/Assists/Updater.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/Updater.cs
index 0edb054..59a1d92 100644
--- a/ShrlAlgoToolkit.Revit/Assists/Updater.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/Updater.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 public class Updater : IUpdater
 {
diff --git a/ShrlAlgoToolkit.Revit/Assists/ViewFilterAssist.cs b/ShrlAlgoToolkit.RevitCore/Assists/ViewFilterAssist.cs
similarity index 97%
rename from ShrlAlgoToolkit.Revit/Assists/ViewFilterAssist.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/ViewFilterAssist.cs
index 97ba19c..68b6331 100644
--- a/ShrlAlgoToolkit.Revit/Assists/ViewFilterAssist.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/ViewFilterAssist.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 /// <summary>
 ///     创建参数的参数过滤器
diff --git a/ShrlAlgoToolkit.Revit/Assists/VisualAssist.cs b/ShrlAlgoToolkit.RevitCore/Assists/VisualAssist.cs
similarity index 95%
rename from ShrlAlgoToolkit.Revit/Assists/VisualAssist.cs
rename to ShrlAlgoToolkit.RevitCore/Assists/VisualAssist.cs
index 7797a10..64a180a 100644
--- a/ShrlAlgoToolkit.Revit/Assists/VisualAssist.cs
+++ b/ShrlAlgoToolkit.RevitCore/Assists/VisualAssist.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace ShrlAlgoToolkit.Revit.Assists;
+namespace ShrlAlgoToolkit.RevitCore.Assists;
 
 public static class VisualAssist
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/ApplicationExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/ApplicationExtensions.cs
similarity index 97%
rename from ShrlAlgoToolkit.Revit/Extensions/ApplicationExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/ApplicationExtensions.cs
index d5cde8f..a2c5bc1 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/ApplicationExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/ApplicationExtensions.cs
@@ -4,7 +4,7 @@ using System.Windows;
 
 using System.Windows.Interop;
 
-namespace ShrlAlgoToolkit.Revit.Extensions
+namespace ShrlAlgoToolkit.RevitCore.Extensions
 {
     public static class ApplicationExtensions
     {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/CategoryExtension.cs b/ShrlAlgoToolkit.RevitCore/Extensions/CategoryExtension.cs
similarity index 94%
rename from ShrlAlgoToolkit.Revit/Extensions/CategoryExtension.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/CategoryExtension.cs
index 75fd117..a9f1837 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/CategoryExtension.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/CategoryExtension.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class CategoryExtension
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/ConnectorExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/ConnectorExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/ConnectorExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/ConnectorExtensions.cs
index 9bc8c86..0caf1a0 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/ConnectorExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/ConnectorExtensions.cs
@@ -2,7 +2,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Electrical;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class ConnectorExtensions
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/DebugExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/DebugExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/DebugExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/DebugExtensions.cs
index dbcf887..812e6bf 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/DebugExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/DebugExtensions.cs
@@ -3,7 +3,7 @@ using System.Reflection;
 
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class DebugExtensions
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/DocumentExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/DocumentExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/DocumentExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/DocumentExtensions.cs
index c85bd95..b7742cf 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/DocumentExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/DocumentExtensions.cs
@@ -4,11 +4,12 @@ using System.Text;
 using System.Windows;
 
 using Autodesk.Revit.DB;
-using Autodesk.Revit.DB.Visual;
 using Autodesk.Revit.UI;
-using ShrlAlgoToolkit.Revit.Assists;
+using Autodesk.Revit.DB.Visual;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+using ShrlAlgoToolkit.RevitCore.Assists;
+
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class DocumentExtensions
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/ElementCollectorExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/ElementCollectorExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/ElementCollectorExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/ElementCollectorExtensions.cs
index bd5ac39..4d05df3 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/ElementCollectorExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/ElementCollectorExtensions.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Architecture;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class ElementCollectorExtensions
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/ElementExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/ElementExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/ElementExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/ElementExtensions.cs
index 64c852d..2521681 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/ElementExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/ElementExtensions.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class ElementExtensions
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/ExtensibleStorageExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/ExtensibleStorageExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/ExtensibleStorageExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/ExtensibleStorageExtensions.cs
index 3148164..600abaa 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/ExtensibleStorageExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/ExtensibleStorageExtensions.cs
@@ -4,7 +4,7 @@ using System.Windows;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.ExtensibleStorage;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 /// <summary>
 ///     可扩展存储工具Schema框架->由字段Field组成，是定义
diff --git a/ShrlAlgoToolkit.Revit/Extensions/FamilyExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/FamilyExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/FamilyExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/FamilyExtensions.cs
index 2e7ffa0..9ec2160 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/FamilyExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/FamilyExtensions.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Extensions
+namespace ShrlAlgoToolkit.RevitCore.Extensions
 {
     public static class FamilyExtensions
     {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/HostObjectExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/HostObjectExtensions.cs
similarity index 96%
rename from ShrlAlgoToolkit.Revit/Extensions/HostObjectExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/HostObjectExtensions.cs
index aeecd6a..49555a7 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/HostObjectExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/HostObjectExtensions.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 internal static class HostObjectExtensions
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/ImportInstanceExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/ImportInstanceExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/ImportInstanceExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/ImportInstanceExtensions.cs
index 2ad2be6..6cb63df 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/ImportInstanceExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/ImportInstanceExtensions.cs
@@ -3,7 +3,7 @@ using System.Text;
 
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class ImportInstanceExtensions
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/KeyboardShortcutExtension.cs b/ShrlAlgoToolkit.RevitCore/Extensions/KeyboardShortcutExtension.cs
similarity index 96%
rename from ShrlAlgoToolkit.Revit/Extensions/KeyboardShortcutExtension.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/KeyboardShortcutExtension.cs
index 6bfded4..dd9ab9a 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/KeyboardShortcutExtension.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/KeyboardShortcutExtension.cs
@@ -1,8 +1,8 @@
 using Autodesk.Windows;
 
-using ShrlAlgoToolkit.Revit.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 
-namespace ShrlAlgoToolkit.Revit.Extensions
+namespace ShrlAlgoToolkit.RevitCore.Extensions
 {
     /// <summary>
     /// 为菜单按钮设置快捷键的扩展类
diff --git a/ShrlAlgoToolkit.Revit/Extensions/LevelExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/LevelExtensions.cs
similarity index 84%
rename from ShrlAlgoToolkit.Revit/Extensions/LevelExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/LevelExtensions.cs
index bf4381e..92b7ec4 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/LevelExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/LevelExtensions.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Extensions
+namespace ShrlAlgoToolkit.RevitCore.Extensions
 {
     public static class LevelExtensions
     {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/MEPExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/MEPExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/MEPExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/MEPExtensions.cs
index ad7f409..1c90e9e 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/MEPExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/MEPExtensions.cs
@@ -5,7 +5,7 @@ using Autodesk.Revit.DB.Plumbing;
 
 using System.Diagnostics;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 /// <summary>
 /// MEP扩展类
diff --git a/ShrlAlgoToolkit.Revit/Extensions/MaterialExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/MaterialExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/MaterialExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/MaterialExtensions.cs
index d89af14..014f37c 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/MaterialExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/MaterialExtensions.cs
@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Text;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class MaterialExtensions
 
diff --git a/ShrlAlgoToolkit.Revit/Extensions/ParameterExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/ParameterExtensions.cs
similarity index 92%
rename from ShrlAlgoToolkit.Revit/Extensions/ParameterExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/ParameterExtensions.cs
index 9401e6a..35b0854 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/ParameterExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/ParameterExtensions.cs
@@ -1,9 +1,9 @@
 using Autodesk.Revit.DB;
 
-using ShrlAlgoToolkit.Revit.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 
 using System.Reflection;
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class ParameterExtensions
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/PointerExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/PointerExtensions.cs
similarity index 89%
rename from ShrlAlgoToolkit.Revit/Extensions/PointerExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/PointerExtensions.cs
index b4d8205..106e9ad 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/PointerExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/PointerExtensions.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class PointerExtensions
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/ReferenceExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/ReferenceExtensions.cs
similarity index 95%
rename from ShrlAlgoToolkit.Revit/Extensions/ReferenceExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/ReferenceExtensions.cs
index f319591..8a0cf5c 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/ReferenceExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/ReferenceExtensions.cs
@@ -1,6 +1,6 @@
 using Autodesk.Revit.DB;
 
-namespace ShrlAlgoToolkit.Revit.Extensions
+namespace ShrlAlgoToolkit.RevitCore.Extensions
 {
     public static class ReferenceExtensions
     {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/RoomExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/RoomExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/RoomExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/RoomExtensions.cs
index ca4e701..62a3a0d 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/RoomExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/RoomExtensions.cs
@@ -1,8 +1,8 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Architecture;
-using ShrlAlgoToolkit.Core.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 
 /// <summary>
diff --git a/ShrlAlgoToolkit.Revit/Extensions/ScheduleExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/ScheduleExtensions.cs
similarity index 73%
rename from ShrlAlgoToolkit.Revit/Extensions/ScheduleExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/ScheduleExtensions.cs
index 835ddd8..e0862bf 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/ScheduleExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/ScheduleExtensions.cs
@@ -1,55 +1,15 @@
 using Autodesk.Revit.DB;
 
-using OfficeOpenXml;
-
 using System.Data;
 using System.IO;
 
-namespace ShrlAlgoToolkit.Revit.Extensions
+namespace ShrlAlgoToolkit.RevitCore.Extensions
 {
     /// <summary>
     ///     明细表转换类
     /// </summary>
     public static class ScheduleExtensions
     {
-        /// <summary>
-        ///     导出明细表
-        /// </summary>
-        /// <param name="viewSchedule"></param>
-        /// <param name="path"></param>
-        public static void ScheduleToExcel(this ViewSchedule viewSchedule, string path)
-        {
-            var td = viewSchedule.GetTableData();
-            var tdb = td.GetSectionData(SectionType.Header);
-            var head = viewSchedule.GetCellText(SectionType.Header, 0, 0);
-
-            var tdd = td.GetSectionData(SectionType.Body);
-            var hc = tdb.NumberOfColumns;
-            var hr = tdb.NumberOfRows;
-
-            var c = tdd.NumberOfColumns;
-            var r = tdd.NumberOfRows;
-
-            var fi = new FileInfo(path);
-            using (var package = new ExcelPackage(fi))
-            {
-                var worksheet = package.Workbook.Worksheets[1];
-                //var worksheet = package.Workbook.Worksheets["基本构件"];
-                for (var i = 0; i < r; i++)
-                {
-                    for (var j = 0; j < c; j++)
-                    {
-                        var ctype = tdd.GetCellType(i, j);
-                        var str = viewSchedule.GetCellText(SectionType.Body, i, j);
-                        worksheet.Cells[i, j].Value = viewSchedule.GetCellText(SectionType.Body, i, j);
-                    }
-                }
-
-                package.Save();
-            }
-            ;
-        }
-
         /// <summary>
         ///     明细表转换为datable
         /// </summary>
diff --git a/ShrlAlgoToolkit.Revit/Extensions/SpatialExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/SpatialExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/SpatialExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/SpatialExtensions.cs
index 6a2d0de..9982f4f 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/SpatialExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/SpatialExtensions.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
-using ShrlAlgoToolkit.Revit.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class SpatialExtensions
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/TransactionExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/TransactionExtensions.cs
similarity index 98%
rename from ShrlAlgoToolkit.Revit/Extensions/TransactionExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/TransactionExtensions.cs
index 98ca774..ba14040 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/TransactionExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/TransactionExtensions.cs
@@ -1,10 +1,10 @@
 using Autodesk.Revit.DB;
 
-using ShrlAlgoToolkit.Revit.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 
 using System.Runtime.CompilerServices;
 
-namespace ShrlAlgoToolkit.Revit.Extensions
+namespace ShrlAlgoToolkit.RevitCore.Extensions
 {
     public static class TransactionExtensions
     {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/UIDocumentExtensons.cs b/ShrlAlgoToolkit.RevitCore/Extensions/UIDocumentExtensons.cs
similarity index 98%
rename from ShrlAlgoToolkit.Revit/Extensions/UIDocumentExtensons.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/UIDocumentExtensons.cs
index 723f152..2213132 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/UIDocumentExtensons.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/UIDocumentExtensons.cs
@@ -1,9 +1,9 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Selection;
-using ShrlAlgoToolkit.Revit.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class UIDocumentExtensons
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/UIExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/UIExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/UIExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/UIExtensions.cs
index 1549492..ddf46fb 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/UIExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/UIExtensions.cs
@@ -2,7 +2,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 
-using ShrlAlgoToolkit.Core.Assists;
+using ShrlAlgoToolkit.RevitCore.Assists;
 
 using System.Diagnostics;
 using System.Drawing;
@@ -16,7 +16,7 @@ using System.Windows.Media.Imaging;
 
 using adWin = Autodesk.Windows;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class UIExtensions
 {
diff --git a/ShrlAlgoToolkit.Revit/Extensions/UnitExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/UnitExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/UnitExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/UnitExtensions.cs
index cdd2924..52bd1ef 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/UnitExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/UnitExtensions.cs
@@ -1,7 +1,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Structure;
 
-namespace ShrlAlgoToolkit.Revit.Extensions
+namespace ShrlAlgoToolkit.RevitCore.Extensions
 {
     /// <summary>
     ///     单位转换
diff --git a/ShrlAlgoToolkit.Revit/Extensions/ViewExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/ViewExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/ViewExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/ViewExtensions.cs
index 2d74a3b..9973cb1 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/ViewExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/ViewExtensions.cs
@@ -3,7 +3,7 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.UI;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 /// SectionView:
 /// RightDirection = CropBox.Transform.BasisX;
diff --git a/ShrlAlgoToolkit.Revit/Extensions/WallExtensions.cs b/ShrlAlgoToolkit.RevitCore/Extensions/WallExtensions.cs
similarity index 99%
rename from ShrlAlgoToolkit.Revit/Extensions/WallExtensions.cs
rename to ShrlAlgoToolkit.RevitCore/Extensions/WallExtensions.cs
index a395d86..c326cf8 100644
--- a/ShrlAlgoToolkit.Revit/Extensions/WallExtensions.cs
+++ b/ShrlAlgoToolkit.RevitCore/Extensions/WallExtensions.cs
@@ -1,7 +1,8 @@
 using Autodesk.Revit.DB;
-using ShrlAlgoToolkit.Revit.Assists;
 
-namespace ShrlAlgoToolkit.Revit.Extensions;
+using ShrlAlgoToolkit.RevitCore.Assists;
+
+namespace ShrlAlgoToolkit.RevitCore.Extensions;
 
 public static class WallExtensions
 {
diff --git a/ShrlAlgoToolkit.Revit/ShrlAlgoToolkit.Revit.projitems b/ShrlAlgoToolkit.RevitCore/ShrlAlgoToolkit.RevitCore.projitems
similarity index 91%
rename from ShrlAlgoToolkit.Revit/ShrlAlgoToolkit.Revit.projitems
rename to ShrlAlgoToolkit.RevitCore/ShrlAlgoToolkit.RevitCore.projitems
index 01d508f..0531f46 100644
--- a/ShrlAlgoToolkit.Revit/ShrlAlgoToolkit.Revit.projitems
+++ b/ShrlAlgoToolkit.RevitCore/ShrlAlgoToolkit.RevitCore.projitems
@@ -6,7 +6,7 @@
     <SharedGUID>2cda289e-5405-4493-b342-57e54ec50a79</SharedGUID>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>ShrlAlgoToolkit.Revit</Import_RootNamespace>
+    <Import_RootNamespace>ShrlAlgoToolkit.RevitCore</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Assists\PublishAssist.cs" />
@@ -16,7 +16,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Assists\DuplicateTypeNamesHandler.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\RevitCommandEndedMonitor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\ReferenceExtensions.cs" />
-    <Compile Include="..\ShrlAlgoToolkit.Revit\Assists\DwgElementSelection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Assists\DwgElementSelection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\ElementInLinkOrCurrentDocument.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\ElementOrientation.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\EnableInFamilyDocument.cs" />
@@ -35,23 +35,23 @@
     <Compile Include="$(MSBuildThisFileDirectory)Assists\HasActiveDocument.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\KeyboardShortcutService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\KeyIntPtrHelper.cs" />
-    <Compile Include="..\ShrlAlgoToolkit.Revit\Assists\DefaultFamilyLoadOptions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Assists\DefaultFamilyLoadOptions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\NativeModule.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\OnProjectDocument.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\OptionsBarAssist.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\ParameterAssist.cs" />
-    <Compile Include="..\ShrlAlgoToolkit.Revit\Extensions\ParameterExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Extensions\ParameterExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\PointerExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\RevitIniAssist.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\ShortcutRepAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\SpatialAssist.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\StatusBarAssist.cs" />
-    <Compile Include="..\ShrlAlgoToolkit.Revit\Assists\UIAssist.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Assists\UIAssist.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\Updater.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\ViewFilterAssist.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Assists\VisualAssist.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\ApplicationExtensions.cs" />
-    <Compile Include="..\ShrlAlgoToolkit.Revit\Extensions\ConnectorExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)\Extensions\ConnectorExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\DebugExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\DocumentExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\ElementExtensions.cs" />
diff --git a/ShrlAlgoToolkit.Revit/ShrlAlgoToolkit.Revit.shproj b/ShrlAlgoToolkit.RevitCore/ShrlAlgoToolkit.RevitCore.shproj
similarity index 93%
rename from ShrlAlgoToolkit.Revit/ShrlAlgoToolkit.Revit.shproj
rename to ShrlAlgoToolkit.RevitCore/ShrlAlgoToolkit.RevitCore.shproj
index 518ed72..554f45a 100644
--- a/ShrlAlgoToolkit.Revit/ShrlAlgoToolkit.Revit.shproj
+++ b/ShrlAlgoToolkit.RevitCore/ShrlAlgoToolkit.RevitCore.shproj
@@ -9,6 +9,6 @@
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
   <PropertyGroup />
-  <Import Project="ShrlAlgoToolkit.Revit.projitems" Label="Shared" />
+  <Import Project="ShrlAlgoToolkit.RevitCore.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
 </Project>
diff --git a/ShrlAlgoToolkit.sln b/ShrlAlgoToolkit.sln
index 07fc075..a2e4888 100644
--- a/ShrlAlgoToolkit.sln
+++ b/ShrlAlgoToolkit.sln
@@ -18,7 +18,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MelskinTest", "MelskinTest\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShrlAlgoStudio", "ShrlAlgoStudio\ShrlAlgoStudio.csproj", "{069234FE-56D1-487B-9C25-58F9A80DB88E}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ShrlAlgoToolkit.Revit", "ShrlAlgoToolkit.Revit\ShrlAlgoToolkit.Revit.shproj", "{2CDA289E-5405-4493-B342-57E54EC50A79}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ShrlAlgoToolkit.RevitCore", "ShrlAlgoToolkit.RevitCore\ShrlAlgoToolkit.RevitCore.shproj", "{2CDA289E-5405-4493-B342-57E54EC50A79}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -53,8 +53,8 @@ Global
 		SolutionGuid = {CADC66CE-1F2B-4344-834E-E1EDF5C61ACC}
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		ShrlAlgoToolkit.Revit\ShrlAlgoToolkit.Revit.projitems*{2cda289e-5405-4493-b342-57e54ec50a79}*SharedItemsImports = 13
-		ShrlAlgoToolkit.Revit\ShrlAlgoToolkit.Revit.projitems*{aa64ed67-e47e-46b1-a6f6-999a26193e57}*SharedItemsImports = 5
-		ShrlAlgoToolkit.Revit\ShrlAlgoToolkit.Revit.projitems*{ba8ebf4a-1aac-42a5-9bc6-e3130158c8dd}*SharedItemsImports = 5
+		ShrlAlgoToolkit.RevitCore\ShrlAlgoToolkit.RevitCore.projitems*{2cda289e-5405-4493-b342-57e54ec50a79}*SharedItemsImports = 13
+		ShrlAlgoToolkit.RevitCore\ShrlAlgoToolkit.RevitCore.projitems*{aa64ed67-e47e-46b1-a6f6-999a26193e57}*SharedItemsImports = 5
+		ShrlAlgoToolkit.RevitCore\ShrlAlgoToolkit.RevitCore.projitems*{ba8ebf4a-1aac-42a5-9bc6-e3130158c8dd}*SharedItemsImports = 5
 	EndGlobalSection
 EndGlobal