diff --git a/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js b/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js
index b890d42d54..c2dffef4b6 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/newRowScreen.js
@@ -43,6 +43,7 @@ const createScreen = table => {
         tableId: table._id,
         type: "table",
       },
+      size: "spectrum--medium",
     })
 
   const fieldGroup = new Component("@budibase/standard-components/fieldgroup")
diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
index a1a1e17fd5..6065d938f1 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js
@@ -100,7 +100,6 @@ const createScreen = table => {
     .instanceName("Form")
     .customProps({
       actionType: "Update",
-      theme: "spectrum--lightest",
       size: "spectrum--medium",
       dataSource: {
         label: table.name,
diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
index ccf1fceb29..188682ed3f 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
+++ b/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
@@ -65,6 +65,7 @@ const createScreen = table => {
         tableId: table._id,
         type: "table",
       },
+      size: "spectrum--medium",
       paginate: true,
       limit: 8,
     })