diff --git a/Oqtane.Client/Themes/Theme1/Container1.razor b/Oqtane.Client/Themes/Theme1/Container1.razor
index 4e0cce0a..c8cbfa1d 100644
--- a/Oqtane.Client/Themes/Theme1/Container1.razor
+++ b/Oqtane.Client/Themes/Theme1/Container1.razor
@@ -2,13 +2,13 @@
 @using Oqtane.Client.Themes.Controls
 @using Oqtane.Client.Shared
 @inherits ContainerBase
-<div class="container1">
-    <div class="row">
+<div class="container">
+    <div class="row px-4">
         <ModuleActions /><h2><ModuleTitle /></h2>
         <hr style="width: 100%; color: gray; height: 1px; background-color:gray;" />
     </div>
-    <div class="row">
-        <div class="container1Content">
+    <div class="row px-4">
+        <div class="container">
             <ModuleInstance />
         </div>
     </div>
diff --git a/Oqtane.Client/Themes/Theme1/Theme1.razor b/Oqtane.Client/Themes/Theme1/Theme1.razor
index e55e828a..d48f3808 100644
--- a/Oqtane.Client/Themes/Theme1/Theme1.razor
+++ b/Oqtane.Client/Themes/Theme1/Theme1.razor
@@ -12,16 +12,16 @@
     <div class="top-row px-4">
         <h1>@PageState.Page.Name - Theme #1</h1> <div class="ml-md-auto"><Profile /> <Login /> <ControlPanel /></div>
     </div>
-    <div class="container-fluid pt-4">
-        <div class="row">
+    <div class="container">
+        <div class="row px-4">
             <div class="col-sm">
                 <Pane Name="Left" />
             </div>
-            <div class="col-sm px-4">
+            <div class="col-sm">
                 <Pane Name="Right" />
             </div>
         </div>
-        <div class="row">
+        <div class="row px-4">
             <Pane Name="Admin" />
         </div>
     </div>