diff --git a/Common/BlazorServerCommon_NET10.csproj b/Common/BlazorServerCommon_NET10.csproj
index 5b5deb2..8532c96 100644
--- a/Common/BlazorServerCommon_NET10.csproj
+++ b/Common/BlazorServerCommon_NET10.csproj
@@ -24,7 +24,9 @@
     <None Include="wwwroot\interop.js" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Syncfusion.Blazor" Version="33.1.44" />
+    <PackageReference Include="Syncfusion.Blazor.Diagram" Version="34.1.29" />
+    <PackageReference Include="Syncfusion.Blazor.Themes" Version="34.1.29" />
+    <PackageReference Include="Syncfusion.PdfExport.Net.Core" Version="34.1.29" />
   </ItemGroup>
   
   
diff --git a/Common/BlazorWasmCommon_NET10.csproj b/Common/BlazorWasmCommon_NET10.csproj
index 59a39e9..022a35f 100644
--- a/Common/BlazorWasmCommon_NET10.csproj
+++ b/Common/BlazorWasmCommon_NET10.csproj
@@ -18,7 +18,9 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.1" PrivateAssets="all" />
-		<PackageReference Include="Syncfusion.Blazor" Version="33.1.44" />
+    <PackageReference Include="Syncfusion.Blazor.Diagram" Version="34.1.29" />
+    <PackageReference Include="Syncfusion.Blazor.Themes" Version="34.1.29" />
+    <PackageReference Include="Syncfusion.PdfExport.Net.Core" Version="34.1.29" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Common/Pages/DiagramExportDialog.razor b/Common/Pages/DiagramExportDialog.razor
index 17f8e98..fa652fe 100644
--- a/Common/Pages/DiagramExportDialog.razor
+++ b/Common/Pages/DiagramExportDialog.razor
@@ -1,7 +1,6 @@
 @using Syncfusion.Blazor.Popups
 @using Syncfusion.Blazor.DropDowns
 @using Syncfusion.Blazor.Diagram
-@using Syncfusion.Blazor.Inputs
 @using Syncfusion.Blazor.Buttons
 @inject IJSRuntime jsRuntime
 @namespace MindMap
diff --git a/Common/Pages/DiagramMainContent.cs b/Common/Pages/DiagramMainContent.cs
index 64afc9e..ac38dfb 100644
--- a/Common/Pages/DiagramMainContent.cs
+++ b/Common/Pages/DiagramMainContent.cs
@@ -1,13 +1,4 @@
-using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
-using System;
-using System.Threading.Tasks;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using Syncfusion.Blazor.Diagram;
-using System.Runtime.CompilerServices;
-using System.Security.Cryptography.X509Certificates;
-
+using Syncfusion.Blazor.Diagram;
 
 namespace MindMap
 {
diff --git a/Common/Pages/DiagramMainContent.razor b/Common/Pages/DiagramMainContent.razor
index 6372b9c..00e1a04 100644
--- a/Common/Pages/DiagramMainContent.razor
+++ b/Common/Pages/DiagramMainContent.razor
@@ -1,13 +1,9 @@
 @using Syncfusion.Blazor.Diagram
-@using Syncfusion.Blazor.Buttons
 @using System.Collections.ObjectModel
-@using System.Text.Json;
 @inherits SampleBaseComponent;
 @using Syncfusion.Blazor.Navigations
-@using Syncfusion.Blazor.Popups
 @namespace MindMap
 
-
 <div class="db-diagram-container">
     <div id="palette-space" class="sb-mobile-palette" style="display:@DisplayTreeViewNodes">
         <div id="treeview">
diff --git a/Common/Pages/DiagramMenuBar.razor b/Common/Pages/DiagramMenuBar.razor
index 0860f43..0f12405 100644
--- a/Common/Pages/DiagramMenuBar.razor
+++ b/Common/Pages/DiagramMenuBar.razor
@@ -2,12 +2,8 @@
 @using Syncfusion.Blazor.Navigations;
 @using Syncfusion.Blazor.Diagram
 @using Syncfusion.PdfExport;
-@using System.Text.Json.Serialization;
-@using System.Text.Json;
 @using System.Collections.ObjectModel;
 @using Syncfusion.Blazor.SplitButtons;
-@using Microsoft.JSInterop
-@using Microsoft.AspNetCore.Components.Web
 @using System;
 @inject IJSRuntime jsRuntime
 @namespace MindMap
diff --git a/Common/Pages/DiagramToolBar.razor b/Common/Pages/DiagramToolBar.razor
index 2022579..40fdb2b 100644
--- a/Common/Pages/DiagramToolBar.razor
+++ b/Common/Pages/DiagramToolBar.razor
@@ -1,7 +1,6 @@
 @using Syncfusion.Blazor.Navigations
 @using Syncfusion.Blazor.Buttons
 @using Syncfusion.Blazor.SplitButtons
-@using Syncfusion.Blazor.DropDowns
 @using Syncfusion.Blazor.Inputs
 
 @namespace MindMap
@@ -65,7 +64,7 @@
                             </SfDropDownButton>
 
                             <div class=@HideButtonCss style="background-color: @HideButtonBackground;margin-left:12px;margin-top:-2px;min-width:30px;min-height:20px;border-color:transparent">
-                                <SfButton ID="btnHideProperty" IconCss="sf-icon-properties tb-hide-button tb-icons" OnClick="@HidePropertyContainer"></SfButton>
+                                <SfButton ID="btnHideProperty" IconCss="sf-icon-properties tb-hide-button tb-icons" OnClick="@HidePropertyContainer" style="border-color: transparent;"></SfButton>
                           </div>
                         </Template>
                     </ToolbarItem>
diff --git a/Common/Pages/DiagramToolBar.razor.cs b/Common/Pages/DiagramToolBar.razor.cs
index b3d8b64..5cfacec 100644
--- a/Common/Pages/DiagramToolBar.razor.cs
+++ b/Common/Pages/DiagramToolBar.razor.cs
@@ -2,7 +2,6 @@
 using Microsoft.JSInterop;
 using System;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using Syncfusion.Blazor.Diagram;
diff --git a/Common/Pages/FileUtil.cs b/Common/Pages/FileUtil.cs
index cead342..f7cf93f 100644
--- a/Common/Pages/FileUtil.cs
+++ b/Common/Pages/FileUtil.cs
@@ -1,6 +1,4 @@
 using Microsoft.JSInterop;
-using System;
-using System.Threading.Tasks;
 
 namespace MindMap
 {
diff --git a/Common/Pages/MindMapPropertyContainer.razor b/Common/Pages/MindMapPropertyContainer.razor
index 24b0f09..52a235a 100644
--- a/Common/Pages/MindMapPropertyContainer.razor
+++ b/Common/Pages/MindMapPropertyContainer.razor
@@ -3,12 +3,9 @@
 @using System.Collections.Generic
 @using Syncfusion.Blazor.DropDowns
 @using Syncfusion.Blazor.Inputs
-@using Syncfusion.Blazor.Popups;
 @using Syncfusion.Blazor.Navigations
 @using Syncfusion.Blazor.Diagram
 @using System.Collections.ObjectModel
-@using Newtonsoft.Json.Linq;
-@using Syncfusion.Blazor.SplitButtons
 @using System.Drawing
 @inject IJSRuntime js
 
@@ -78,15 +75,15 @@
             <div class="col-xs-6 db-col-right">
                 <span class="db-prop-text-style">Type</span>
             </div>
-            <div class="col-xs-2 db-col-center" style="margin-left: -30px; ">
+            <div class="col-xs-2 db-col-center" style="margin-left: -50px; ">
                 <span class="db-prop-text-style">Stroke</span>
             </div>
-            <div class="col-xs-2 db-col-left" style="margin-left: 25px">
+            <div class="col-xs-2 db-col-left" style="margin-left: 15px;">
                 <span class="db-prop-text-style">Thickness</span>
             </div>
         </div>
     <div class="row">
-            <div  class="col-xs-6 db-col-left" style="width:90px;margin-top:3px">
+            <div  class="col-xs-5 db-col-left" style="width:70px;margin-top:3px">
             <SfDropDownList ID="strokeStyle" TValue="string" TItem="BorderStylesFields" PopupWidth="160px" Index="@strokeStyleValue" DataSource="@BorderStyles">
                 <DropDownListTemplates TItem="BorderStylesFields">
                     <ItemTemplate>
@@ -109,7 +106,7 @@
                     <SfColorPicker ID="mindmapStroke" ValueChange="OnStrokeColorChange" Mode="ColorPickerMode.Palette" @bind-Value="@strokeColorValue"></SfColorPicker>
             </div>
         </div>
-            <div class="col-xs-4 db-col-center" style="width:87px;margin-left: 34px;margin-top:4px;">
+            <div class="col-xs-7 db-col-center" style="width:110px;margin-left: 34px;margin-top:4px;">
                 <SfNumericTextBox ID="mindmapStrokeWidth" Format="###.##" Min="0" Step="0.5" @bind-Value="@mindMapStrokeWidth">
                 <NumericTextBoxEvents TValue="double" ValueChange="@OnStrokeWidthChange"></NumericTextBoxEvents>
             </SfNumericTextBox>
@@ -192,20 +189,20 @@
     <div class="db-prop-separator">
     </div>
     <div class="row db-prop-row">
-        <div class="col-xs-8 db-col-right db-prop-text-style" style="padding-top: 12px;">
+        <div class="col-xs-7 db-col-right db-prop-text-style" style="padding-top: 12px;">
             <span class="db-prop-text-style">Horizontal Spacing</span>
         </div>
-        <div  class="col-xs-4 db-col-left" style="padding-top: 8px">
+        <div  class="col-xs-5 db-col-left" style="padding-top: 8px">
             <SfNumericTextBox TValue="int?" Width="100%" @bind-Value="@horizontalValue" Min="20" Step="2" Format="###.##">
                 <NumericTextBoxEvents TValue="int?" ValueChange="OnHorizontalSpaceChange"></NumericTextBoxEvents>
             </SfNumericTextBox>
         </div>
     </div>
     <div class="row db-prop-row">
-        <div class="col-xs-8 db-col-right db-prop-text-style" style="padding-top: 12px;">
+        <div class="col-xs-7 db-col-right db-prop-text-style" style="padding-top: 12px;">
             <span class="db-prop-text-style">Vertical Spacing</span>
         </div>
-        <div  class="col-xs-4 db-col-left" style="padding-top: 8px;">
+        <div  class="col-xs-5 db-col-left" style="padding-top: 8px;">
             <SfNumericTextBox TValue="int?" Width="100%" @bind-Value="@verticalValue" Min="20" Step="2" Format="###.##">
                 <NumericTextBoxEvents TValue="int?" ValueChange="OnVerticalSpaceChange"></NumericTextBoxEvents>
             </SfNumericTextBox>
diff --git a/Common/Shared/MainLayout.razor b/Common/Shared/MainLayout.razor
index 92adf6b..05ebe3e 100644
--- a/Common/Shared/MainLayout.razor
+++ b/Common/Shared/MainLayout.razor
@@ -4,7 +4,6 @@
 @inject SyncfusionBlazorService SyncfusionBlazorService;
 @using Syncfusion.Blazor;
 @using MindMap;
-@using MindMap.Shared
 @inject Microsoft.AspNetCore.Components.NavigationManager UriHelper;
 @namespace MindMap.Shared
 <Syncfusion.Blazor.Popups.SfDialogProvider />
diff --git a/Common/Shared/SampleComponentBase.cs b/Common/Shared/SampleComponentBase.cs
index ff667cf..520c685 100644
--- a/Common/Shared/SampleComponentBase.cs
+++ b/Common/Shared/SampleComponentBase.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 
 namespace MindMap.Shared
diff --git a/Common/Shared/SampleService.cs b/Common/Shared/SampleService.cs
index c5b5793..7927621 100644
--- a/Common/Shared/SampleService.cs
+++ b/Common/Shared/SampleService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading.Tasks;
-
-namespace MindMap.Shared
+namespace MindMap.Shared
 {
     public class SampleService
     {
diff --git a/Server/Components/App.razor b/Server/Components/App.razor
index 06dee02..a457eee 100644
--- a/Server/Components/App.razor
+++ b/Server/Components/App.razor
@@ -47,7 +47,7 @@
    <ResourcePreloader />
    <link rel="icon" type="image/x-icon" href="favicon.ico">
    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" />
-    <link href="_content/Syncfusion.Blazor/styles/fluent2.css" rel="stylesheet">
+    <link href="_content/Syncfusion.Blazor.Themes/fluent2.css" rel="stylesheet">
 
    <link href="@Assets["assets/db-icons1/style.css"]" rel="stylesheet" />
    <link href="@Assets["assets/dbstyle/diagrambuilder.css"]" rel="stylesheet" />
@@ -75,7 +75,15 @@
         </environment>
     </div>
     <ReconnectModal />
-    <script src="@Assets["_content/Syncfusion.Blazor/scripts/syncfusion-blazor.min.js"]" type="text/javascript"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Diagram/scripts/sf-diagramcomponent.min.js"]" type="text/javascript"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.DropDowns/scripts/sf-dropdownlist.min.js"]" type="text/javascript"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Inputs/scripts/sf-colorpicker.min.js"]" type="text/javascript"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Popups/scripts/sf-tooltip.min.js"]" type="text/javascript"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Navigations/scripts/sf-toolbar.min.js"]"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Navigations/scripts/sf-treeview.min.js"]"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Buttons/scripts/sf-checkbox.min.js"]"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Popups/scripts/sf-dialog.min.js"]"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Inputs/scripts/sf-uploader.min.js"]"></script>
     <script src="@Assets["_framework/blazor.web.js"]"></script>
 </body>
 
diff --git a/Server/Controllers/CultureController.cs b/Server/Controllers/CultureController.cs
index 938b128..cdfe0e8 100644
--- a/Server/Controllers/CultureController.cs
+++ b/Server/Controllers/CultureController.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Localization;
 
 namespace MindMap.Controllers
diff --git a/Server/wwwroot/assets/dbstyle/diagrambuilder.css b/Server/wwwroot/assets/dbstyle/diagrambuilder.css
index bf3d0a6..f817807 100644
--- a/Server/wwwroot/assets/dbstyle/diagrambuilder.css
+++ b/Server/wwwroot/assets/dbstyle/diagrambuilder.css
@@ -311,10 +311,8 @@ fill: black;
     
     .e-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn.tb-item-selected .e-btn-icon,
     .tb-property-open #btnHideProperty .tb-hide-button {
-        padding-left:2px;
-        margin-left:-6px;
-        margin-bottom:4px;
         color:white;
+        padding-bottom: 8px;
     }
 .e-toolbar-left  .e-toolbar-item.tb-item-selected .e-tbar-btn .e-icons.e-btn-icon {
     color: white;
diff --git a/WASM/MindMap/Components/App.razor b/WASM/MindMap/Components/App.razor
index 61355f6..fc5bed3 100644
--- a/WASM/MindMap/Components/App.razor
+++ b/WASM/MindMap/Components/App.razor
@@ -43,7 +43,7 @@
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" />
     <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet'>
     <link href=@Urihelper.Uri rel="canonical" />
-    <link href="_content/Syncfusion.Blazor/styles/fluent2.css" rel="stylesheet">
+    <link href="_content/Syncfusion.Blazor.Themes/fluent2.css" rel="stylesheet">
     <link href="@Assets["assets/db-icons1/style.css"]" rel="stylesheet" />
     <link href="@Assets["assets/dbstyle/diagrambuilder.css"]" rel="stylesheet" />
     <script src="@Assets["_content/BlazorWasmCommon_NET10/interop.js"]"></script>
@@ -86,7 +86,15 @@
             }
         }, 3000);
     </script>
-    <script src="@Assets["_content/Syncfusion.Blazor/scripts/syncfusion-blazor.min.js"]" type="text/javascript"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Diagram/scripts/sf-diagramcomponent.min.js"]" type="text/javascript"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.DropDowns/scripts/sf-dropdownlist.min.js"]" type="text/javascript"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Inputs/scripts/sf-colorpicker.min.js"]" type="text/javascript"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Popups/scripts/sf-tooltip.min.js"]" type="text/javascript"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Navigations/scripts/sf-toolbar.min.js"]"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Navigations/scripts/sf-treeview.min.js"]"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Buttons/scripts/sf-checkbox.min.js"]"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Popups/scripts/sf-dialog.min.js"]"></script>
+    <script src="@Assets["_content/Syncfusion.Blazor.Inputs/scripts/sf-uploader.min.js"]"></script>
     <script src="@Assets["_framework/blazor.web.js"]"></script>
 </body>
 
diff --git a/WASM/MindMap/wwwroot/assets/dbstyle/diagrambuilder.css b/WASM/MindMap/wwwroot/assets/dbstyle/diagrambuilder.css
index 8b49e93..015fbf2 100644
--- a/WASM/MindMap/wwwroot/assets/dbstyle/diagrambuilder.css
+++ b/WASM/MindMap/wwwroot/assets/dbstyle/diagrambuilder.css
@@ -311,9 +311,7 @@ fill: black;
     
     .e-toolbar .e-toolbar-items .e-toolbar-item .e-dropdown-btn.tb-item-selected .e-btn-icon,
     .tb-property-open #btnHideProperty .tb-hide-button {
-        padding-left:2px;
-        margin-left:-6px;
-        margin-bottom:4px;
+        padding-bottom:8px;
         color:white;
     }
 .e-toolbar-left  .e-toolbar-item.tb-item-selected .e-tbar-btn .e-icons.e-btn-icon {