diff --git a/.gitignore b/.gitignore
index fa82ec1d93b..e2c5b7bbd01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -373,14 +373,6 @@ src/**/wwwroot/**/uploader
 # npm
 **/package-lock.json
 
-# sass
-**/BootstrapBlazor/wwwroot/css/animate.min.css
-**/BootstrapBlazor/wwwroot/css/bootstrapblazor.min.css
-**/BootstrapBlazor/wwwroot/css/bootstrap.min.css
-**/BootstrapBlazor/wwwroot/css/bootstrap.rtl.min.css
-**/BootstrapBlazor/wwwroot/css/sweetalert2.css
-**/BootstrapBlazor/wwwroot/css/motronic.min.css
-**/BootstrapBlazor/wwwroot/css/nano.min.css
-
 # Bootstrap
 **/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js
+**/BootstrapBlazor/wwwroot/css/bootstrapblazor.min.css
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 39c6bf406a0..02b9cf1ada6 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -10,16 +10,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="sasscompiler.json" />
-    <Content Remove="wwwroot\core\**\*.*" />
-    <Content Remove="wwwroot\lib\**\*.css" />
-    <Content Remove="wwwroot\scss\**\*.*" />
-    <Content Remove="wwwroot\src\**\*.*" />
-    <None Include="sasscompiler.json" />
-    <None Include="wwwroot\core\**\*.*" />
-    <None Include="wwwroot\lib\**\*.css" />
-    <None Include="wwwroot\scss\**\*.*" />
-    <None Include="wwwroot\src\**\*.*" />
+    <Content Remove="wwwroot\core\bootstrap\css\bootstrap.css" />
+    <Content Remove="wwwroot\core\bootstrap\css\bootstrap.rtl.css" />
+    <Content Remove="wwwroot\core\bootstrap\js\bootstrap.bundle.js" />
+    <Content Remove="wwwroot\core\bootstrap\js\bootstrap.bundle.min.js" />
+    <Content Remove="wwwroot\lib\swal\sweetalert2.css" />
+    <Content Remove="wwwroot\scss\*" />
+    <None Include="wwwroot\core\bootstrap\css\bootstrap.css" />
+    <None Include="wwwroot\core\bootstrap\css\bootstrap.rtl.css" />
+    <None Include="wwwroot\core\bootstrap\js\bootstrap.bundle.js" />
+    <None Include="wwwroot\core\bootstrap\js\bootstrap.bundle.min.js" />
+    <None Include="wwwroot\lib\swal\sweetalert2.css" />
+    <None Include="wwwroot\scss\*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/ColorPicker/ColorPicker.razor.js b/src/BootstrapBlazor/Components/ColorPicker/ColorPicker.razor.js
index 9289c64d96b..90437241425 100644
--- a/src/BootstrapBlazor/Components/ColorPicker/ColorPicker.razor.js
+++ b/src/BootstrapBlazor/Components/ColorPicker/ColorPicker.razor.js
@@ -25,7 +25,7 @@ const getOrCreatePickr = async (id, picker, options) => {
     const { isSupportOpacity } = options;
 
     if (isSupportOpacity === true) {
-        await addLink("./_content/BootstrapBlazor/css/nano.min.css");
+        await addLink("./_content/BootstrapBlazor/lib/pickr/nano.min.css");
 
         const { invoke, pickr } = picker;
         if (pickr) {
diff --git a/src/BootstrapBlazor/Directory.Build.targets b/src/BootstrapBlazor/Directory.Build.targets
index 8133b919089..d6f187ae6d9 100644
--- a/src/BootstrapBlazor/Directory.Build.targets
+++ b/src/BootstrapBlazor/Directory.Build.targets
@@ -3,22 +3,17 @@
   <Import Project="..\..\Version.props" />
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.SassCompiler" Version="1.92.1" Condition="'$(Configuration)'=='Debug' and '$(TargetFramework)' == '$(RunTargetFramework)'" />
+    <PackageReference Include="AspNetCore.SassCompiler" Version="1.93.2" Condition="'$(Configuration)'=='Debug' and '$(TargetFramework)' == '$(RunTargetFramework)'" />
   </ItemGroup>
 
-  <Target Name="CopyCss" AfterTargets="Build" Condition="'$(TargetFramework)' == '$(RunTargetFramework)'">
-    <Message Text="Copy bootstrap assets ..." Importance="high"></Message>
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/js/bootstrap.bundle.min.js" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/js/bootstrap.blazor.bundle.min.js" SkipUnchangedFiles="true"></Copy>
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/css/bootstrap.min.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/bootstrap.min.css" SkipUnchangedFiles="true"></Copy>
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/css/bootstrap.rtl.min.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/bootstrap.rtl.min.css" SkipUnchangedFiles="true"></Copy>
-
-    <Message Text="Copy bootstrapblazor assets ..." Importance="high"></Message>
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/lib/animate/animate.min.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/animate.min.css" SkipUnchangedFiles="true"></Copy>
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/lib/swal/sweetalert2.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/sweetalert2.css" SkipUnchangedFiles="true"></Copy>
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/lib/pickr/nano.min.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/nano.min.css" SkipUnchangedFiles="true"></Copy>
+  <PropertyGroup>
+    <BootstrapBundleFile>$(MSBuildThisFileDirectory)wwwroot/core/bootstrap/js/bootstrap.bundle.min.js</BootstrapBundleFile>
+    <TargetBootstrapBundleFile>$(MSBuildThisFileDirectory)wwwroot/js/bootstrap.blazor.bundle.min.js</TargetBootstrapBundleFile>
+  </PropertyGroup>
 
-    <Message Text="Copy motronic theme ..." Importance="high"></Message>
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)wwwroot/src/css/motronic.css" DestinationFiles="$(MSBuildThisFileDirectory)wwwroot/css/motronic.min.css" SkipUnchangedFiles="true"></Copy>
+  <Target Name="CopyCss" AfterTargets="Build" Condition="'$(TargetFramework)' == '$(RunTargetFramework)'">
+    <Message Text="Copy bootstrap.bundle.min.js ..." Importance="high"></Message>
+    <Copy SourceFiles="$(BootstrapBundleFile)" DestinationFiles="$(TargetBootstrapBundleFile)" SkipUnchangedFiles="true"></Copy>
   </Target>
 
 </Project>
diff --git a/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.min.css b/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.min.css
index 5dee3a49295..b810310a384 100644
--- a/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.min.css
+++ b/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.min.css
@@ -1,4 +1,4 @@
-@import url('bootstrap.min.css');
+@import url('../core/bootstrap/css/bootstrap.min.css');
 @import url('bootstrapblazor.min.css');
-@import url('animate.min.css');
-@import url('sweetalert2.css');
+@import url('../lib/animate/animate.min.css');
+@import url('../lib/swal/sweetalert2.min.css');
diff --git a/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.rtl.min.css b/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.rtl.min.css
index 7385ba9f724..b29bc12df10 100644
--- a/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.rtl.min.css
+++ b/src/BootstrapBlazor/wwwroot/css/bootstrap.blazor.bundle.rtl.min.css
@@ -1,5 +1,4 @@
-@import url('bootstrap.rtl.min.css');
+@import url('../core/bootstrap/css/bootstrap.rtl.min.css');
 @import url('bootstrapblazor.min.css');
-@import url('rtl.css');
-@import url('animate.min.css');
-@import url('sweetalert2.css');
+@import url('../lib/animate/animate.min.css');
+@import url('../lib/swal/sweetalert2.min.css');
diff --git a/src/BootstrapBlazor/wwwroot/src/css/motronic.css b/src/BootstrapBlazor/wwwroot/css/motronic.min.css
similarity index 100%
rename from src/BootstrapBlazor/wwwroot/src/css/motronic.css
rename to src/BootstrapBlazor/wwwroot/css/motronic.min.css
diff --git a/src/BootstrapBlazor/wwwroot/css/rtl.css b/src/BootstrapBlazor/wwwroot/css/rtl.css
deleted file mode 100644
index edae899072b..00000000000
--- a/src/BootstrapBlazor/wwwroot/css/rtl.css
+++ /dev/null
@@ -1,21 +0,0 @@
-[dir="rtl"] .card-collapse-bar:not([aria-expanded=true]) > .card-collapse-arrow {
-    transform: rotate(180deg);
-}
-
-[dir="rtl"] .form-select-append {
-    right: unset;
-    left: 0;
-}
-
-[dir="rtl"] .select .clear-icon {
-    right: unset;
-    left: 0;
-}
-
-[dir="rtl"] .pagination .page-item:first-child .page-link > i {
-    transform: rotate(180deg);
-}
-
-[dir="rtl"] .pagination .page-item:last-child .page-link > i {
-    transform: rotate(180deg);
-}
diff --git a/src/BootstrapBlazor/wwwroot/scss/components.scss b/src/BootstrapBlazor/wwwroot/scss/components.scss
index 6bdf936067c..f95ddb9fe29 100644
--- a/src/BootstrapBlazor/wwwroot/scss/components.scss
+++ b/src/BootstrapBlazor/wwwroot/scss/components.scss
@@ -117,3 +117,25 @@
 @use "../../Components/Waterfall/Waterfall.razor.scss";
 @use "../../Components/Watermark/Watermark.razor.scss";
 @use "./meilisearch.scss";
+
+[dir="rtl"] .card-collapse-bar:not([aria-expanded=true]) > .card-collapse-arrow {
+    transform: rotate(180deg);
+}
+
+[dir="rtl"] .form-select-append {
+    right: unset;
+    left: 0;
+}
+
+[dir="rtl"] .select .clear-icon {
+    right: unset;
+    left: 0;
+}
+
+[dir="rtl"] .pagination .page-item:first-child .page-link > i {
+    transform: rotate(180deg);
+}
+
+[dir="rtl"] .pagination .page-item:last-child .page-link > i {
+    transform: rotate(180deg);
+}