diff --git a/Elsa.sln b/Elsa.sln
index e744927f3..9a42fb895 100644
--- a/Elsa.sln
+++ b/Elsa.sln
@@ -55,7 +55,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Web.Activities.Primiti
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dashboard", "Dashboard", "{DA45AD45-2F4F-48E0-AF88-8F71082DF866}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa", "src\web\themes\Elsa\Elsa.csproj", "{CEB772E3-0C19-475E-B517-2295C1EF173A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Web.BootstrapTheme", "src\web\themes\Elsa.Web.BootstrapTheme\Elsa.Web.BootstrapTheme.csproj", "{CEB772E3-0C19-475E-B517-2295C1EF173A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{DF7D6DFE-319E-497E-9DBF-AB41C0CF0123}"
 EndProject
diff --git a/src/samples/SampleHost.Web/appsettings.json b/src/samples/SampleHost.Web/appsettings.json
index 1d35392b3..a9f94d39a 100644
--- a/src/samples/SampleHost.Web/appsettings.json
+++ b/src/samples/SampleHost.Web/appsettings.json
@@ -6,7 +6,7 @@
   },
   "AllowedHosts": "*",
     "FileStore": {
-        "RootDirectory": "C:\\Activities\\Projects\\Elsa\\src\\web\\dashboard\\App_Data\\Sites\\Default\\workflows\\workflows",
+        "RootDirectory": "C:\\Activities\\Projects\\Elsa.Web.BootstrapTheme\\src\\web\\dashboard\\App_Data\\Sites\\Default\\workflows\\workflows",
         "Format": "YAML"
     }
 }
diff --git a/src/web/dashboard/Elsa.Web.Dashboard/Elsa.Web.Dashboard.csproj b/src/web/dashboard/Elsa.Web.Dashboard/Elsa.Web.Dashboard.csproj
index 5dcbaaf5a..2f66924cb 100644
--- a/src/web/dashboard/Elsa.Web.Dashboard/Elsa.Web.Dashboard.csproj
+++ b/src/web/dashboard/Elsa.Web.Dashboard/Elsa.Web.Dashboard.csproj
@@ -28,7 +28,7 @@
         <ProjectReference Include="..\..\modules\Elsa.Web.Components\Elsa.Web.Components.csproj" />
         <ProjectReference Include="..\..\modules\Elsa.Web.Management\Elsa.Web.Management.csproj" />
         <ProjectReference Include="..\..\modules\Elsa.Web.Persistence.FileSystem\Elsa.Web.Persistence.FileSystem.csproj" />
-        <ProjectReference Include="..\..\themes\Elsa\Elsa.csproj" />
+        <ProjectReference Include="..\..\themes\Elsa.Web.BootstrapTheme\Elsa.Web.BootstrapTheme.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/web/dashboard/Elsa.Web.Dashboard/tenants.json b/src/web/dashboard/Elsa.Web.Dashboard/tenants.json
index fc60155f1..6d87cbb6f 100644
--- a/src/web/dashboard/Elsa.Web.Dashboard/tenants.json
+++ b/src/web/dashboard/Elsa.Web.Dashboard/tenants.json
@@ -3,9 +3,9 @@
         "State": "Running",
         "RequestUrlHost": null,
         "RequestUrlPrefix": null,
-        "CurrentTheme" : "Elsa",
+        "CurrentTheme" : "Elsa.Web.BootstrapTheme",
         "Features": [
-            "Elsa", 
+            "Elsa.Web.BootstrapTheme", 
             "Elsa.Web.Management",
             "Elsa.Web.Persistence.FileSystem",
             "Elsa.Web.Components",
diff --git a/src/web/modules/Elsa.Web.Management/Manifest.cs b/src/web/modules/Elsa.Web.Management/Manifest.cs
index 4d49df548..5afb7f4bf 100644
--- a/src/web/modules/Elsa.Web.Management/Manifest.cs
+++ b/src/web/modules/Elsa.Web.Management/Manifest.cs
@@ -4,5 +4,5 @@
     Name = "Workflows Management",
     Category = "Workflows",
     Description = "Provides admin screens to manage workflows.",
-    Dependencies = new[] { "Elsa.Web.Components" }
+    Dependencies = new[] { "Elsa.Web.BootstrapTheme.Web.Components" }
 )]
\ No newline at end of file
diff --git a/src/web/themes/Elsa/Assets/package-lock.json b/src/web/themes/Elsa.Web.BootstrapTheme/Assets/package-lock.json
similarity index 100%
rename from src/web/themes/Elsa/Assets/package-lock.json
rename to src/web/themes/Elsa.Web.BootstrapTheme/Assets/package-lock.json
diff --git a/src/web/themes/Elsa/Assets/package.json b/src/web/themes/Elsa.Web.BootstrapTheme/Assets/package.json
similarity index 100%
rename from src/web/themes/Elsa/Assets/package.json
rename to src/web/themes/Elsa.Web.BootstrapTheme/Assets/package.json
diff --git a/src/web/themes/Elsa/Assets/scripts/@types/feather.d.ts b/src/web/themes/Elsa.Web.BootstrapTheme/Assets/scripts/@types/feather.d.ts
similarity index 100%
rename from src/web/themes/Elsa/Assets/scripts/@types/feather.d.ts
rename to src/web/themes/Elsa.Web.BootstrapTheme/Assets/scripts/@types/feather.d.ts
diff --git a/src/web/themes/Elsa/Assets/scripts/dashboard.ts b/src/web/themes/Elsa.Web.BootstrapTheme/Assets/scripts/dashboard.ts
similarity index 100%
rename from src/web/themes/Elsa/Assets/scripts/dashboard.ts
rename to src/web/themes/Elsa.Web.BootstrapTheme/Assets/scripts/dashboard.ts
diff --git a/src/web/themes/Elsa/Assets/styles/dashboard.scss b/src/web/themes/Elsa.Web.BootstrapTheme/Assets/styles/dashboard.scss
similarity index 100%
rename from src/web/themes/Elsa/Assets/styles/dashboard.scss
rename to src/web/themes/Elsa.Web.BootstrapTheme/Assets/styles/dashboard.scss
diff --git a/src/web/themes/Elsa/Elsa.csproj b/src/web/themes/Elsa.Web.BootstrapTheme/Elsa.Web.BootstrapTheme.csproj
similarity index 97%
rename from src/web/themes/Elsa/Elsa.csproj
rename to src/web/themes/Elsa.Web.BootstrapTheme/Elsa.Web.BootstrapTheme.csproj
index 32a2cda02..7dad60d56 100644
--- a/src/web/themes/Elsa/Elsa.csproj
+++ b/src/web/themes/Elsa.Web.BootstrapTheme/Elsa.Web.BootstrapTheme.csproj
@@ -9,6 +9,7 @@
         <RepositoryUrl>https://github.com/sfmskywalker/Elsa</RepositoryUrl>
         <RepositoryType>GitHub</RepositoryType>
         <PackageTags>elsa, workflows, orchard</PackageTags>
+        <RootNamespace>Elsa</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/web/themes/Elsa/Manifest.cs b/src/web/themes/Elsa.Web.BootstrapTheme/Manifest.cs
similarity index 100%
rename from src/web/themes/Elsa/Manifest.cs
rename to src/web/themes/Elsa.Web.BootstrapTheme/Manifest.cs
diff --git a/src/web/themes/Elsa/Views/Elsa.Web.Management/Shared/WorkflowEditor.cshtml b/src/web/themes/Elsa.Web.BootstrapTheme/Views/Elsa.Web.Management/Shared/WorkflowEditor.cshtml
similarity index 100%
rename from src/web/themes/Elsa/Views/Elsa.Web.Management/Shared/WorkflowEditor.cshtml
rename to src/web/themes/Elsa.Web.BootstrapTheme/Views/Elsa.Web.Management/Shared/WorkflowEditor.cshtml
diff --git a/src/web/themes/Elsa/Views/Elsa.Web.Management/Workflows/Edit.cshtml b/src/web/themes/Elsa.Web.BootstrapTheme/Views/Elsa.Web.Management/Workflows/Edit.cshtml
similarity index 100%
rename from src/web/themes/Elsa/Views/Elsa.Web.Management/Workflows/Edit.cshtml
rename to src/web/themes/Elsa.Web.BootstrapTheme/Views/Elsa.Web.Management/Workflows/Edit.cshtml
diff --git a/src/web/themes/Elsa/Views/Elsa.Web.Management/Workflows/Index.cshtml b/src/web/themes/Elsa.Web.BootstrapTheme/Views/Elsa.Web.Management/Workflows/Index.cshtml
similarity index 100%
rename from src/web/themes/Elsa/Views/Elsa.Web.Management/Workflows/Index.cshtml
rename to src/web/themes/Elsa.Web.BootstrapTheme/Views/Elsa.Web.Management/Workflows/Index.cshtml
diff --git a/src/web/themes/Elsa/Views/Elsa.Web.Management/Workflows/New.cshtml b/src/web/themes/Elsa.Web.BootstrapTheme/Views/Elsa.Web.Management/Workflows/New.cshtml
similarity index 100%
rename from src/web/themes/Elsa/Views/Elsa.Web.Management/Workflows/New.cshtml
rename to src/web/themes/Elsa.Web.BootstrapTheme/Views/Elsa.Web.Management/Workflows/New.cshtml
diff --git a/src/web/themes/Elsa/Views/Layout.cshtml b/src/web/themes/Elsa.Web.BootstrapTheme/Views/Layout.cshtml
similarity index 93%
rename from src/web/themes/Elsa/Views/Layout.cshtml
rename to src/web/themes/Elsa.Web.BootstrapTheme/Views/Layout.cshtml
index ff36999da..cbd3848c9 100644
--- a/src/web/themes/Elsa/Views/Layout.cshtml
+++ b/src/web/themes/Elsa.Web.BootstrapTheme/Views/Layout.cshtml
@@ -6,7 +6,7 @@
     <title>Dashboard</title>
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous" />
-    <link rel="stylesheet" href="~/Elsa/dashboard.css"/>
+    <link rel="stylesheet" href="~/Elsa.Web.BootstrapTheme/dashboard.css"/>
     <resources type="Meta"/>
     <resources type="HeadLink"/>
     <resources type="Stylesheet"/>
@@ -34,7 +34,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/feather-icons/4.9.0/feather.min.js"></script>
-<script src="~/Elsa/dashboard.js"></script>
+<script src="~/Elsa.Web.BootstrapTheme/dashboard.js"></script>
 <resources type="Footer"/>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/web/themes/Elsa/Views/Shared/Sidebar.cshtml b/src/web/themes/Elsa.Web.BootstrapTheme/Views/Shared/Sidebar.cshtml
similarity index 100%
rename from src/web/themes/Elsa/Views/Shared/Sidebar.cshtml
rename to src/web/themes/Elsa.Web.BootstrapTheme/Views/Shared/Sidebar.cshtml
diff --git a/src/web/themes/Elsa/Views/_ViewImports.cshtml b/src/web/themes/Elsa.Web.BootstrapTheme/Views/_ViewImports.cshtml
similarity index 100%
rename from src/web/themes/Elsa/Views/_ViewImports.cshtml
rename to src/web/themes/Elsa.Web.BootstrapTheme/Views/_ViewImports.cshtml
diff --git a/src/web/themes/Elsa/assets.json b/src/web/themes/Elsa.Web.BootstrapTheme/assets.json
similarity index 100%
rename from src/web/themes/Elsa/assets.json
rename to src/web/themes/Elsa.Web.BootstrapTheme/assets.json