diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/Container1.razor b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/Container1.razor
index 7066215b..928ce551 100644
--- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/Container1.razor
+++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/Container1.razor
@@ -33,11 +33,9 @@
     {
         try
         {
+
             _title = bool.Parse(SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Title", "true"));
-            _classes += " " + SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Background", "");
-            _classes += " " + SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Text", "");
-            _classes += " " + SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Border", "");
-            _classes = _classes.Trim();
+
         }
         catch
         {
diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/ContainerSettings.razor b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/ContainerSettings.razor
index fe0bd680..78cc0d50 100644
--- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/ContainerSettings.razor
+++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/ContainerSettings.razor
@@ -14,72 +14,19 @@
             </select>
         </div>
     </div>
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="background\" ResourceKey="Background" ResourceType="@resourceType" HelpText="Optionally Specify A Background Color For The Container">Background Color:</Label>
-        <div class="col-sm-9">
-            <select id="background" class="form-select" @bind="@_background">
-                <option value="">None</option>
-                <option value="bg-primary">Primary</option>
-                <option value="bg-secondary">Secondary</option>
-                <option value="bg-success">Success</option>
-                <option value="bg-danger">Danger</option>
-                <option value="bg-warning">Warning</option>
-                <option value="bg-info">Info</option>
-                <option value="bg-light">Light</option>
-                <option value="bg-dark">Dark</option>
-            </select>
-        </div>
-    </div>
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="text" ResourceKey="Text" ResourceType="@resourceType" HelpText="Optionally Specify A Text Color For The Container">Text Color:</Label>
-        <div class="col-sm-9">
-            <select id="text" class="form-select" @bind="@_text">
-                <option value="">None</option>
-                <option value="text-primary">Primary</option>
-                <option value="text-secondary">Secondary</option>
-                <option value="text-success">Success</option>
-                <option value="text-danger">Danger</option>
-                <option value="text-warning">Warning</option>
-                <option value="text-info">Info</option>
-                <option value="text-light">Light</option>
-                <option value="text-dark">Dark</option>
-            </select>
-        </div>
-    </div>
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="border" ResourceKey="Border" ResourceType="@resourceType" HelpText="Optionally Specify A Border For The Container">Border Color:</Label>
-        <div class="col-sm-9">
-            <select id="border" class="form-select" @bind="@_border">
-                <option value="">None</option>
-                <option value="border">Default</option>
-                <option value="border border-primary">Primary</option>
-                <option value="border border-secondary">Secondary</option>
-                <option value="border border-success">Success</option>
-                <option value="border border-danger">Danger</option>
-                <option value="border border-warning">Warning</option>
-                <option value="border border-info">Info</option>
-                <option value="border border-light">Light</option>
-                <option value="border border-dark">Dark</option>
-            </select>
-        </div>
-    </div>
 </div>
 
 @code {
 	private string resourceType = "[Owner].Theme.[Theme].ContainerSettings, [Owner].Theme.[Theme].Client.Oqtane"; // for localization
     private string _title = "true";
-    private string _background = "";
-    private string _text = "";
-    private string _border = "";
 
     protected override void OnInitialized()
     {
         try
         {
+
             _title = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Title", "true");
-            _background = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Background", "");
-            _text = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Text", "");
-            _border = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Border", "");
+
         }
         catch (Exception ex)
         {
@@ -93,9 +40,6 @@
         {
 			var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
             settings = SettingService.SetSetting(settings, GetType().Namespace + ":Title", _title);
-            settings = SettingService.SetSetting(settings, GetType().Namespace + ":Background", _background);
-            settings = SettingService.SetSetting(settings, GetType().Namespace + ":Text", _text);
-            settings = SettingService.SetSetting(settings, GetType().Namespace + ":Border", _border);
             await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
         }
         catch (Exception ex)
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 97fba8c4..fdee32d5 100644
--- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor
+++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor
@@ -91,28 +91,16 @@
             </div>
         </div>
         <Pane Name="Bottom Full Width" />
-        @if (_footer)
-        {
-        <div style="clear: both; height: 30px;"></div>
-        <div class="bg-primary fixed-bottom footer">
-            <Pane Name="Footer" />
-        </div>
-        }
-        else
-        {
-        <Pane Name="Footer" />
-        }
     </div>
 </main>
 
 @code {
     public override string Name => "Theme1";
 
-    public override string Panes => PaneNames.Admin + ",Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width,Footer";
+    public override string Panes => PaneNames.Admin + ",Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width";
     
     private bool _login = true;
     private bool _register = true;
-    private bool _footer = false;
 
     protected override void OnParametersSet()
     {
@@ -121,7 +109,6 @@
             var settings = SettingService.MergeSettings(PageState.Site.Settings, PageState.Page.Settings);
             _login = bool.Parse(SettingService.GetSetting(settings, GetType().Namespace + ":Login", "true"));
             _register = bool.Parse(SettingService.GetSetting(settings, GetType().Namespace + ":Register", "true"));
-            _footer = bool.Parse(SettingService.GetSetting(settings, GetType().Namespace + ":Footer", "false"));
         }
         catch
         {
diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/ThemeSettings.razor b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/ThemeSettings.razor
index 7616f815..8db32e1f 100644
--- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/ThemeSettings.razor
+++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/ThemeSettings.razor
@@ -39,16 +39,6 @@
                 </select>
             </div>
         </div>
-        <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="footer" ResourceKey="Footer" ResourceType="@resourceType" HelpText="Specify if a Footer pane should always be displayed in a fixed location at the bottom of the page">Display Fixed Footer?</Label>
-            <div class="col-sm-9">
-                <select id="footer" class="form-select" @bind="@_footer">
-                    <option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
-                    <option value="true">@SharedLocalizer["Yes"]</option>
-                    <option value="false">@SharedLocalizer["No"]</option>
-                </select>
-            </div>
-        </div>
     </div>
 
     @code {
@@ -57,7 +47,6 @@
         private string _scope = "page";
         private string _login = "-";
         private string _register = "-";
-        private string _footer = "-";
 
         protected override async Task OnInitializedAsync()
         {
@@ -84,7 +73,6 @@
                 var settings = PageState.Site.Settings;
                 _login = SettingService.GetSetting(settings, GetType().Namespace + ":Login", "true");
                 _register = SettingService.GetSetting(settings, GetType().Namespace + ":Register", "true");
-                _footer = SettingService.GetSetting(settings, GetType().Namespace + ":Footer", "false");
             }
             else
             {
@@ -92,7 +80,6 @@
                 settings = SettingService.MergeSettings(PageState.Site.Settings, settings);
                 _login = SettingService.GetSetting(settings, GetType().Namespace + ":Login", "-");
                 _register = SettingService.GetSetting(settings, GetType().Namespace + ":Register", "-");
-                _footer = SettingService.GetSetting(settings, GetType().Namespace + ":Footer", "-");
             }
             await Task.Yield();
         }
@@ -128,11 +115,6 @@
                     {
                         settings = SettingService.SetSetting(settings, GetType().Namespace + ":Register", _register, true);
                     }
-
-                    if (_footer != "-")
-                    {
-                        settings = SettingService.SetSetting(settings, GetType().Namespace + ":Footer", _footer, true);
-                    }
                     await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
                 }
                 else
@@ -146,10 +128,6 @@
                     {
                         settings = SettingService.SetSetting(settings, GetType().Namespace + ":Register", _register);
                     }
-                    if (_footer != "-")
-                    {
-                        settings = SettingService.SetSetting(settings, GetType().Namespace + ":Footer", _footer);
-                    }
                     await SettingService.UpdatePageSettingsAsync(settings, pageId);
                 }
             }