diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
index 28693829..cb9fb716 100644
--- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
@@ -22,7 +22,7 @@ else
 			}
 			else
 			{
-                <Pager Items="@_pages.Where(item => item.IsDeleted)" CurrentPage="@_pagePage.ToString()" OnPageChange="OnPageChangePage">
+          <Pager Items="@_pages.Where(item => item.IsDeleted)" CurrentPage="@_pagePage.ToString()" OnPageChange="OnPageChangePage">
 					<Header>
 						<th style="width: 1px;">&nbsp;</th>
 						<th style="width: 1px;">&nbsp;</th>
@@ -50,7 +50,7 @@ else
 			}
 			else
 			{
-                <Pager Items="@_modules.Where(item => item.IsDeleted)" CurrentPage="@_pageModule.ToString()" OnPageChange="OnPageChangeModule">
+          <Pager Items="@_modules.Where(item => item.IsDeleted)" CurrentPage="@_pageModule.ToString()" OnPageChange="OnPageChangeModule">
 					<Header>
 						<th style="width: 1px;">&nbsp;</th>
 						<th style="width: 1px;">&nbsp;</th>
@@ -76,8 +76,8 @@ else
 }
 
 @code {
-	private List<Page> _pages;
-	private List<Module> _modules;
+	  private List<Page> _pages;
+	  private List<Module> _modules;
     private int _pagePage = 1;
     private int _pageModule = 1;
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
@@ -141,7 +141,7 @@ else
         try
         {
             ModuleInstance.ShowProgressIndicator();
-			foreach (Page page in _pages.Where(item => item.IsDeleted))
+            foreach (Page page in _pages.Where(item => item.IsDeleted))
             {
                 await PageService.DeletePageAsync(page.PageId);
                 await logger.LogInformation("Page Permanently Deleted {Page}", page);
@@ -186,7 +186,7 @@ else
             await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
 
             // check if there are any remaining module instances in the site
-            if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
+            if (!_modules.Exists (item => item.ModuleId == module.ModuleId && item.PageModuleId != module.PageModuleId))
             {
                 await ModuleService.DeleteModuleAsync(module.ModuleId);
             }
@@ -207,12 +207,14 @@ else
         try
         {
             ModuleInstance.ShowProgressIndicator();
-			foreach (Module module in _modules.Where(item => item.IsDeleted))
+            foreach (Module module in _modules.Where(item => item.IsDeleted).ToList())
             {
                 await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
 
+                // DeletePageModuleAsync does not update _modules so remove it.
+                _modules.Remove(module);
                 // check if there are any remaining module instances in the site
-                if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
+                if (!_modules.Exists(item => item.ModuleId == module.ModuleId && item.PageModuleId != module.PageModuleId))
                 {
                     await ModuleService.DeleteModuleAsync(module.ModuleId);
                 }
diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor
index 91d8b4b4..d285c05d 100644
--- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor
+++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor
@@ -5,7 +5,7 @@
     <nav class="navbar navbar-dark bg-primary fixed-top">
         <Logo /><Menu Orientation="Horizontal" />
         <div class="controls ms-auto">
-            <div class="controls-group"><UserProfile /> <Login /> <ControlPanel /></div>
+            <div class="controls-group"><UserProfile /> <Login /> <ControlPanel ButtonClass="btn-outline-light" /></div>
         </div>
     </nav>
     <div class="content">
diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/wwwroot/Themes/[Owner].[Theme]/Theme.css b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/wwwroot/Themes/[Owner].[Theme]/Theme.css
index be87af9f..0d325604 100644
--- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/wwwroot/Themes/[Owner].[Theme]/Theme.css
+++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/wwwroot/Themes/[Owner].[Theme]/Theme.css
@@ -4,12 +4,6 @@ body {
     padding-top: 7rem;
 }
 
-.div main {
-    color: black;
-    filter: invert(1);
-    mix-blend-mode: difference;
-}
-
 .table > :not(caption) > * > * {
     box-shadow: none;
 }
@@ -82,7 +76,7 @@ body {
 }
 
 div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu {
-
+    color: #000000;
 }
 
 @media (max-width: 767px) {