bhl-forms 0.7.3 → 0.7.5

package/dist/forms/generalHomeImprovementThankYou.es.js

@@ -2,43 +2,70 @@ function merge() {
   return Object.assign({}, ...arguments)
 }
 
-function HomeImprovementRedirectUrl() {
-  return 'https://listings.zipcontractor.com/api/v1/redirect?zone_id=4&vertical=HomeImprovement&category=${properties.Category}&zip_code=${properties.Zip}&sub_id=${properties.vid}'
-}
-
-const DEFAULT_COMMENTS_LABEL = 'Please briefly describe your issue in a few words:';
-const DEFAULT_COMMENTS_PLACEHOLDER_DYNAMIC = '$getKey($meta, "commentsPlaceholders." + $get(Category).value, $meta.defaultCommentsPlaceholder)';
-const DEFAULT_FINAL_HEADLINE_DYNAMIC_LEGAL = '$getKey($meta, "finalHeadlines." + $get(Type_Of_Legal_Problem).value, $meta.defaultFinalHeadline)';
-const DEFAULT_FINAL_SUBHEADLINE_DYNAMIC_LEGAL = '$getKey($meta, "finalSubHeadlines." + $get(Type_Of_Legal_Problem).value, $meta.defaultFinalSubHeadline)';
+const DEFAULT_COMMENTS_LABEL = "Please briefly describe your issue in a few words:";
+const DEFAULT_COMMENTS_PLACEHOLDER_DYNAMIC =
+  '$getKey($meta, "commentsPlaceholders." + $get(Category).value, $meta.defaultCommentsPlaceholder)';
+const DEFAULT_FINAL_HEADLINE_DYNAMIC_LEGAL =
+  '$getKey($meta, "finalHeadlines." + $get(Type_Of_Legal_Problem).value, $meta.defaultFinalHeadline)';
+const DEFAULT_FINAL_SUBHEADLINE_DYNAMIC_LEGAL =
+  '$getKey($meta, "finalSubHeadlines." + $get(Type_Of_Legal_Problem).value, $meta.defaultFinalSubHeadline)';
 
 const DEFAULT_COMMENTS_PLACEHOLDER_DYNAMIC_HOME_IMPROVEMENT = DEFAULT_COMMENTS_PLACEHOLDER_DYNAMIC;
-const DEFAULT_FINAL_HEADLINE_HOME_IMPROVEMENT = 'We Found Contractors Near You';
-const DEFAULT_FINAL_SUBHEADLINE_HOME_IMPROVEMENT = 'Compare quotes and save! Please verify your contact info:';
-const TCPA_LANGUAGE_HOME_IMPROVEMENT = "By checking this box, I a) agree to the Terms of Use, and b) consent to be contacted by up to 5 contractors, contractor networks, and partners of this website using live, autodialed, pre-recorded, or artificial voice calls, as well as text messages. Your consent is not required as a condition of purchasing any goods or services. To submit this request without this consent, please call us.";
+const DEFAULT_FINAL_HEADLINE_HOME_IMPROVEMENT = "We Found Contractors Near You";
+const DEFAULT_FINAL_SUBHEADLINE_HOME_IMPROVEMENT = "Compare quotes and save! Please verify your contact info:";
+const TCPA_LANGUAGE_HOME_IMPROVEMENT =
+  'By checking this box, I a) agree to the Terms of Use, and b) consent to be contacted by up to four <a href="/providers" target="_blank" class="t-text-blue-600 t-underline">contractors and partners</a> of this website using live, autodialed, pre-recorded, or artificial voice calls, as well as text messages. Your consent is not required as a condition of purchasing any goods or services.';
 
 const radio = (updates) => {
   if (updates.name && !updates.id) {
     updates.id = updates.name;
   }
-  return merge({
-    $formkit: 'radio',
-    validation: 'required',
-    validationMessages: {
-      required: 'Field is required'
+  return merge(
+    {
+      $formkit: "radio",
+      validation: "required",
+      validationMessages: {
+        required: "Field is required",
+      },
+      optionsClass: "t-pt-3 t-pl-1",
+      legendClass: "required",
     },
-    optionsClass: 't-pt-3 t-pl-1',
-    legendClass: 'required'
-  }, updates)
+    updates
+  )
+};
+
+// TODO: rename
+const col2RadioCenter = (updates) => {
+  updates.legendClass = "required t-w-[100%] t-text-center";
+  if (typeof updates.fieldsetClass === "undefined") {
+    updates.fieldsetClass = "$reset t-flex t-justify-center";
+  }
+  updates.innerClass = "t-items-start";
+  updates.wrapperClass = "$reset t-flex t-cursor-pointer t-mb-3";
+  updates.optionClass = "t-pl-4 md:t-pl-8 md:t-min-w-[200px]";
+  updates.optionsClass = "t-pl-4 t-pt-3 t-grid t-grid-cols-1 md:t-grid-cols-2";
+  updates.messagesClass = "t-flex t-justify-center";
+  updates.helpClass = "t-mt-0 t-mb-4 !t-text-sm t-text-center";
+  return radio(updates)
+};
+
+const sbsRadio = (updates) => {
+  updates.legendClass = "legend-left required";
+  updates.fieldsetClass = "$reset side-by-side";
+  updates.optionsClass = "t-pl-1";
+  updates.innerClass = "t-flex t-items-center";
+  updates.wrapperClass = "t-mb-3";
+  return radio(updates)
 };
 
 const verticalRadio = (updates) => {
-  updates.legendClass = 'required';
-  updates.fieldsetClass = '$reset t-flex t-justify-center';
-  updates.optionsClass = 't-pl-2 t-pt-3';
-  updates.innerClass = 't-items-center';
-  updates.wrapperClass = '$reset t-flex t-cursor-pointer t-mb-3';
-  updates.optionClass = 't-pl-4 md:t-pl-12';
-  updates.messagesClass = 't-flex t-justify-center';
+  updates.legendClass = "required";
+  updates.fieldsetClass = "$reset t-flex t-justify-center";
+  updates.optionsClass = "t-pl-2 t-pt-3";
+  updates.innerClass = "t-items-center";
+  updates.wrapperClass = "$reset t-flex t-cursor-pointer t-mb-3";
+  updates.optionClass = "t-pl-4 md:t-pl-12";
+  updates.messagesClass = "t-flex t-justify-center";
   return radio(updates)
 };
 
@@ -46,24 +73,35 @@ const select = (updates) => {
   if (updates.name && !updates.id) {
     updates.id = updates.name;
   }
-  return merge({
-    $formkit: 'select',
-    placeholder: "Please Select",
-    validation: 'required',
-    validationMessages: {
-      required: 'Field is required'
+  return merge(
+    {
+      $formkit: "select",
+      placeholder: "Please Select",
+      validation: "required",
+      validationMessages: {
+        required: "Field is required",
+      },
+      inputClass: "t-bg-white",
+      labelClass: "required",
     },
-    inputClass: 't-bg-white',
-    labelClass: 'required'
-  }, updates)
+    updates
+  )
+};
+
+const sbsSelect = (updates) => {
+  updates.labelClass = "required";
+  updates.wrapperClass = "side-by-side t-items-center";
+  updates.innerClass = "select-height-content";
+  updates.helpClass = "t-mt-2.5 md:t-text-right md:t-mt-[-5px]";
+  return select(updates)
 };
 
 const verticalSelect = (updates) => {
-  updates.labelClass = 'required';
-  updates.wrapperClass = 't-flex t-justify-center';
-  updates.messagesClass = 't-flex t-justify-center';
-  updates.inputClass = 't-min-w-[150px] t-bg-white';
-  updates.helpClass = 't-mt-2.5 t-text-center';
+  updates.labelClass = "required";
+  updates.wrapperClass = "t-flex t-justify-center";
+  updates.messagesClass = "t-flex t-justify-center";
+  updates.inputClass = "t-min-w-[150px] t-bg-white";
+  updates.helpClass = "t-mt-2.5 t-text-center";
   return select(updates)
 };
 
@@ -71,26 +109,29 @@ const text = (updates) => {
   if (updates.name && !updates.id) {
     updates.id = updates.name;
   }
-  return merge({
-    $formkit: 'text',
-    validation: 'required',
-    validationMessages: {
-      required: 'Field is required'
+  return merge(
+    {
+      $formkit: "text",
+      validation: "required",
+      validationMessages: {
+        required: "Field is required",
+      },
+      labelClass: "required",
     },
-    labelClass: 'required'
-  }, updates)
+    updates
+  )
 };
 
 const sbsText = (updates) => {
-  updates.wrapperClass = 'side-by-side t-items-center';
+  updates.wrapperClass = "side-by-side t-items-center";
   return text(updates)
 };
 
 const verticalText = (updates) => {
-  updates.wrapperClass = 't-flex t-justify-center';
-  updates.messagesClass = 't-flex t-justify-center';
-  updates.inputClass = 't-text-center';
-  updates.helpClass = 't-mt-2.5 !t-text-sm t-text-center';
+  updates.wrapperClass = "t-flex t-justify-center";
+  updates.messagesClass = "t-flex t-justify-center";
+  updates.inputClass = "t-text-center";
+  updates.helpClass = "t-mt-2.5 !t-text-sm t-text-center";
   return text(updates)
 };
 
@@ -98,671 +139,897 @@ const textArea = (updates) => {
   if (updates.name && !updates.id) {
     updates.id = updates.name;
   }
-  return merge({
-    $formkit: 'textarea',
-    rows: 5,
-    maxlength: 500,
-    validation: 'required',
-    validationMessages: {
-      required: 'Field is required'
+  return merge(
+    {
+      $formkit: "textarea",
+      rows: 5,
+      maxlength: 500,
+      validation: "required",
+      validationMessages: {
+        required: "Field is required",
+      },
+      innerClass: "t-max-w-xl",
+      labelClass: "required",
     },
-    innerClass: 't-max-w-xl',
-    labelClass: 'required'
-  }, updates)
+    updates
+  )
 };
 
-
 // ------ Common Inputs
 
-
 const address$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? verticalText : sbsText;
-  const label = vertical ? (updates.label) : 'Street Address:';
+  const label = vertical ? updates.label : "Street Address:";
   return func({
     label,
-    placeholder: '10 Example St',
-    name: scope ? scope + ':' + 'Address' : 'Address',
+    placeholder: "10 Example St",
+    name: scope ? scope + ":" + "Address" : "Address",
     autocomplete: "street-address",
-    'data-tf-sensitive': 'false',
+    "data-tf-sensitive": "false",
     minlength: 5,
     maxlength: 100,
     validationMessages: {
-      minlength: 'Invalid Address',
-      required: 'Address is required'
+      minlength: "Invalid Address",
+      required: "Address is required",
     },
-    ...updates
+    ...updates,
   })
 };
 
-const email = (scope) => sbsText({
-  $formkit: 'email',
-  name: scope ? scope + ':' + 'Email' : 'Email',
-  label: 'Email Address:',
-  placeholder: 'email@domain.com',
-  autocomplete: 'email',
-  'data-tf-sensitive': 'false',
-  validation: 'required|email',
-  validationMessages: {
-    required: 'Email is required',
-    email: 'Invalid Email'
-  }
-});
-
-const firstName = (scope) => sbsText({
-  label: 'First Name:',
-  placeholder: 'First',
-  name: scope ? scope + ':' + 'First_Name' : 'First_Name',
-  autocomplete: "given-name",
-  validationMessages: {
-    required: 'First Name is required'
-  }
-});
+const email = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalText : sbsText;
+  const label = vertical ? updates.label : "Email Address:";
+  return func({
+    $formkit: "email",
+    name: scope ? scope + ":" + "Email" : "Email",
+    label,
+    placeholder: "email@domain.com",
+    autocomplete: "email",
+    "data-tf-sensitive": "false",
+    validation: "required|email",
+    validationMessages: {
+      required: "Email is required",
+      email: "Invalid Email",
+    },
+    ...updates,
+  })
+};
 
-const lastName = (scope) => sbsText({
-  label: 'Last Name:',
-  placeholder: 'Last',
-  name: scope ? scope + ':' + 'Last_Name' : 'Last_Name',
-  autocomplete: "family-name",
-  validationMessages: {
-    required: 'Last Name is required'
-  }
-});
+const firstName = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalText : sbsText;
+  const label = vertical ? updates.label : "First Name:";
+  return func({
+    label,
+    placeholder: "First",
+    name: scope ? scope + ":" + "First_Name" : "First_Name",
+    autocomplete: "given-name",
+    validationMessages: {
+      required: "First Name is required",
+    },
+    ...updates,
+  })
+};
 
-const phone = (scope) => sbsText({
-  $formkit: 'tel',
-  name: scope ? scope + ':' + 'Primary_Phone' : 'Primary_Phone',
-  label: 'Phone Number:',
-  placeholder: '###-###-####',
-  maxlength: 12,
-  help: '10-digit phone number, hyphens optional',
-  autocomplete: 'tel-national',
-  'data-tf-sensitive': 'false',
-  validation: 'required|matches:/^[0-9]{3}-?[0-9]{3}-?[0-9]{4}$/|valid_phone',
-  validationMessages: {
-    required: 'Field is required',
-    matches: 'Invalid Phone Format, use ###-###-####',
-    valid_phone: 'Invalid Phone Number'
-  },
-  helpClass: "t-mt-2.5 md:t-text-right md:t-mt-[-2px]"
-});
+const lastName = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalText : sbsText;
+  const label = vertical ? updates.label : "Last Name:";
+  return func({
+    label,
+    placeholder: "Last",
+    name: scope ? scope + ":" + "Last_Name" : "Last_Name",
+    autocomplete: "family-name",
+    validationMessages: {
+      required: "Last Name is required",
+    },
+    ...updates,
+  })
+};
 
+const phone = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalText : sbsText;
+  const label = vertical ? updates.label : "Phone Number:";
+  return func({
+    $formkit: "tel",
+    name: scope ? scope + ":" + "Primary_Phone" : "Primary_Phone",
+    label,
+    placeholder: "###-###-####",
+    maxlength: 12,
+    help: "10-digit phone number, hyphens optional",
+    autocomplete: "tel-national",
+    "data-tf-sensitive": "false",
+    validation: "required|matches:/^[0-9]{3}-?[0-9]{3}-?[0-9]{4}$/|valid_phone",
+    validationMessages: {
+      required: "Phone Number is required",
+      matches: "Invalid Phone Format, use ###-###-####",
+      valid_phone: "Invalid Phone Number",
+    },
+    helpClass: "t-mt-2.5 md:t-text-right md:t-mt-[-2px]",
+    ...updates,
+  })
+};
 
 const zipcode$1 = (scope, vertical, updates = {}) => {
   const func = vertical ? verticalText : sbsText;
-  const label = vertical ? (updates.label) : 'Zip Code:';
-  const help = vertical ? (updates.help ?? "We try to match you with local help") : null;  
+  const label = vertical ? updates.label : "Zip Code:";
+  const help = vertical ? updates.help ?? "We try to match you with local help" : null;
   return func({
     label,
     help,
-    placeholder: '#####',
-    name: scope ? scope + ':' + 'Zip' : 'Zip',
+    placeholder: "#####",
+    name: scope ? scope + ":" + "Zip" : "Zip",
     maxlength: 5,
     inputmode: "numeric",
-    autocomplete: 'postal-code',
-    validation: 'required|matches:/^[0-9]{5}$/',
+    autocomplete: "postal-code",
+    validation: "required|matches:/^[0-9]{5}$/",
     validationMessages: {
-      required: 'Zip Code is required',
-      matches: 'Invalid Zip Code'
+      required: "Zip Code is required",
+      matches: "Invalid Zip Code",
     },
-    ...updates
+    ...updates,
   })
 };
 
-const comments = (updates, scope) => textArea(
-  merge({
-    name: scope ? scope + ':' + 'Comments' : 'Comments',
-    label: 'Please briefly describe your situation in a few words:',
-    placeholder: 'For Example: "I would like help with child support payments" or "I need help with visitation rights"'
-  }, updates)
-);
+// TODO: vertical not supported yet
+const comments = (scope, vertical, updates) =>
+  textArea(
+    merge(
+      {
+        name: scope ? scope + ":" + "Comments" : "Comments",
+        label: "Please briefly describe your situation in a few words:",
+        placeholder:
+          'For Example: "I would like help with child support payments" or "I need help with visitation rights"',
+      },
+      updates
+    )
+  );
 
 const TCPAConsent = (scope) => ({
-  $formkit: 'checkbox',
-  label: '$meta.tcpaLanguage',
-  name: scope ? scope + ':' + 'TCPA_Opt_In' : 'TCPA_Opt_In',
-  'data-tf-sensitive': 'false',
-  validation: 'required|accepted',
+  $formkit: "checkbox",
+  label: "$meta.tcpaLanguage",
+  // Necessary to get links to work in the tcpa language
+  __raw__sectionsSchema: {
+    label: { attrs: { innerHTML: "$label" } },
+  },
+  name: scope ? scope + ":" + "TCPA_Opt_In" : "TCPA_Opt_In",
+  "data-tf-sensitive": "false",
+  validation: "required|accepted",
   validationMessages: {
-    required: 'Consent is required',
-    accepted: 'Consent is required'
+    required: "Consent is required",
+    accepted: "Consent is required",
   },
   classes: {
-    label: "t-text-xs t-text-slate-500 t-font-normal"
-  }
+    label: "t-text-xs t-text-slate-500 t-font-normal",
+  },
 });
 
 const HomeImprovementCategoryOptions = [
-  'Additions',
-  'Appliances',
-  'Appraisals',
-  'Cabinets',
-  'Carpentry',
-  'Carpets',
-  'Cleaning',
-  'Countertops',
-  'Decks and Porches',
-  'Demolition',
-  'Doors',
-  'Driveways',
-  'Drywall and Plaster',
-  'Electrical',
-  'Fencing',
-  'Flooring',
-  'Foundations',
-  'Garage Doors',
-  'General Contractors',
-  'Gutters',
-  'Handyman',
-  'Holiday Decorators',
-  'Smart Home',
-  'Home Builders',
-  'Home Inspection',
-  'Home Organization',
-  'Home Security',
-  'Home Staging',
-  'Home Theater',
-  'Home Warranties',
-  'Hot Tubs',
-  'Heating and Cooling',
-  'Insulation',
-  'Junk Removal',
-  'Landscaping',
-  'Locksmiths',
-  'Masonry and Concrete',
-  'Restoration',
+  "Additions",
+  "Appliances",
+  "Appraisals",
+  "Cabinets",
+  "Carpentry",
+  "Carpets",
+  "Cleaning",
+  "Countertops",
+  "Decks and Porches",
+  "Demolition",
+  "Doors",
+  "Driveways",
+  "Drywall and Plaster",
+  "Electrical",
+  "Fencing",
+  "Flooring",
+  "Foundations",
+  "Garage Doors",
+  "General Contractors",
+  "Gutters",
+  "Handyman",
+  "Holiday Decorators",
+  "Smart Home",
+  "Home Builders",
+  "Home Inspection",
+  "Home Organization",
+  "Home Security",
+  "Home Staging",
+  "Home Theater",
+  "Home Warranties",
+  "Hot Tubs",
+  "Heating and Cooling",
+  "Insulation",
+  "Junk Removal",
+  "Landscaping",
+  "Locksmiths",
+  "Masonry and Concrete",
+  "Restoration",
   // 'Moving',
-  'Painting',
-  'Pest Control',
-  'Pools',
-  'Plumbing',
-  'Pressure Washing',
-  'Remodeling',
-  'Roofing',
-  'Sheds',
-  'Siding',
-  'Solar',
-  'Tiling',
-  'Walk-in Tubs',
-  'Waterproofing',
-  'Window Cleaning',
-  'Windows'
+  "Painting",
+  "Pest Control",
+  "Pools",
+  "Plumbing",
+  "Pressure Washing",
+  "Remodeling",
+  "Roofing",
+  "Sheds",
+  "Siding",
+  "Solar",
+  "Tiling",
+  "Walk-in Tubs",
+  "Waterproofing",
+  "Window Cleaning",
+  "Windows",
+  "Not Sure or Other",
 ];
 
-const homeImprovementCategory$1 = (updates) => verticalSelect(merge({
-  name: 'Category',
-  id: 'Category',
-  options: HomeImprovementCategoryOptions,
-}, updates));
-
-const timeframe$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Timeframe' : 'Timeframe',
-  // label: 'What is the project timeframe?',
-  options: [
-    'Immediate',
-    '1-6 Months',
-    'More than 6 Months'
-  ]
-});
+const homeImprovementCategory$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "Select a Category:";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Category" : "Category",
+        options: HomeImprovementCategoryOptions,
+      },
+      updates
+    )
+  )
+};
 
-const ownHome$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Own_Home' : 'Own_Home',
-  // label: 'Do you own the home?',
-  options: [
-    'Yes',
-    'No',
-    'No but authorized'
-  ]
-});
+const timeframe$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What is the project timeframe?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Timeframe" : "Timeframe",
+        options: ["Immediate", "1-6 Months", "More than 6 Months"],
+      },
+      updates
+    )
+  )
+};
 
-const additionsSubType$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Additions_Subtype' : 'Additions_Subtype',
-  // label: 'What type of addition?',
-  options: [
-    'Garage',
-    'In-Law Suite',
-    'Additional Rooms',
-    'Additional Stories',
-    'Bump-out',
-    'Sunroom',
-    'Accessory Dwelling Unit',
-    'Basement Remodeling',
-    'Attic Remodeling',
-    'Not Sure or Other'
-  ]
-});
+const ownHome$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "Do you own the home?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Own_Home" : "Own_Home",
+        options: ["Yes", "No", "No but authorized"],
+      },
+      updates
+    )
+  )
+};
 
-const constructionAreaSize$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Construction_Area_Size' : 'Construction_Area_Size',
-  // label: 'What is the size of the construction area?',
-  options: [
-    'Less than 1000 square feet',
-    '1000 to 2000 square feet',
-    'More than 2000 square feet'
-  ]
-});
+const additionsSubType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What type of addition?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Additions_Subtype" : "Additions_Subtype",
+        options: [
+          "Garage",
+          "In-Law Suite",
+          "Additional Rooms",
+          "Additional Stories",
+          "Bump-out",
+          "Sunroom",
+          "Accessory Dwelling Unit",
+          "Basement Remodeling",
+          "Attic Remodeling",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
+const constructionAreaSize$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What is the size of the construction area?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Construction_Area_Size" : "Construction_Area_Size",
+        options: ["Less than 1000 square feet", "1000 to 2000 square feet", "More than 2000 square feet"],
+      },
+      updates
+    )
+  )
+};
 
-const homeImprovementWorkType$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Work_Type' : 'Work_Type',
-  // label: 'What type of work do you need?',
-  options: [
-    'Install or Replace',
-    'Repair',
-    'Not Sure or Other'
-  ]
-});
+const homeImprovementWorkType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of work?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Work_Type" : "Work_Type",
+        options: ["Install or Replace", "Repair", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const applianceType$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Appliance_Type' : 'Appliance_Type',
-  // label: 'What type of appliance?',
-  options: [
-    'Cooktop',
-    'Dishwasher',
-    'Dryer',
-    'Freezer',
-    'Garbage Disposal',
-    'Ice Maker',
-    'Microwave',
-    'Range',
-    'Refrigerator',
-    'Stove',
-    'Trash Compactor',
-    'Oven',
-    'Vacuum',
-    'Washer Machine',
-    'Not Sure or Other',
-  ]
-});
+const applianceType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What type of appliance?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Appliance_Type" : "Appliance_Type",
+        options: [
+          "Cooktop",
+          "Dishwasher",
+          "Dryer",
+          "Freezer",
+          "Garbage Disposal",
+          "Ice Maker",
+          "Microwave",
+          "Range",
+          "Refrigerator",
+          "Stove",
+          "Trash Compactor",
+          "Oven",
+          "Vacuum",
+          "Washer Machine",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
+const cabinetWorkType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of work?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Cabinet_Work_Type" : "Cabinet_Work_Type",
+        options: ["Install", "Refinish", "Reface", "Repair", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const cabinetWorkType$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Cabinet_Work_Type' : 'Cabinet_Work_Type',
-  // label: 'What type of work do you need?',
-  options: [
-    'Install',
-    'Refinish',
-    'Reface',
-    'Repair',
-    'Not Sure or Other'
-  ]
-});
+const carpentrySubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What carpentry job type?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Carpentry_Subtype" : "Carpentry_Subtype",
+        options: [
+          "Closets",
+          "Custom Furniture",
+          "Built-ins",
+          "Framing",
+          "Interior Trim",
+          "Exterior Trim",
+          "Windows",
+          "Stairways and Railings",
+          "Gazebo or Pergola",
+          "Multiple Jobs",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const carpentrySubtype$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Carpentry_Subtype' : 'Carpentry_Subtype',
-  // label: 'What type of carpentry work?',
-  options: [
-    'Closets',
-    'Custom Furniture',
-    'Built-ins',
-    'Framing',
-    'Interior Trim',
-    'Exterior Trim',
-    'Windows',
-    'Stairways and Railings',
-    'Gazebo or Pergola',
-    'Multiple Jobs',
-    'Not Sure or Other'
-  ]
-});
+const carpetWorkType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of work?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Carpet_Work_Type" : "Carpet_Work_Type",
+        options: ["Install or Replace", "Repair", "Cleaning", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const carpetWorkType$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Carpet_Work_Type' : 'Carpet_Work_Type',
-  // label: 'What type of work do you need?',
-  options: [
-    'Install or Replace',
-    'Repair',
-    'Cleaning',
-    'Not Sure or Other'
-  ]
-});
+const cleaningSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What type of cleaning?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Cleaning_Subtype" : "Cleaning_Subtype",
+        options: [
+          "Whole Home",
+          "Office",
+          "Carpets",
+          "Windows",
+          "Air Ducts or Vents",
+          "Chimney",
+          "Deck",
+          "Tile or Grout",
+          "Garage",
+          "Shed",
+          "Gutters",
+          "Pool",
+          "Junk Removal",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const cleaningSubtype$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Cleaning_Subtype' : 'Cleaning_Subtype',
-  // label: 'What type of cleaning?',
-  options: [
-    'Whole Home',
-    'Office',
-    'Carpets',
-    'Windows',
-    'Air Ducts or Vents',
-    'Chimney',
-    'Deck',
-    'Tile or Grout',
-    'Garage',
-    'Shed',
-    'Gutters',
-    'Pool',
-    'Junk Removal',
-    'Not Sure or Other'
-  ]
-});
+const countertopMaterial$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What type of countertop?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Countertop_Material" : "Countertop_Material",
+        options: [
+          "Concrete",
+          "Granite",
+          "Laminate",
+          "Marble",
+          "Quartz",
+          "Stainless Steel",
+          "Wood",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const countertopMaterial$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Countertop_Material' : 'Countertop_Material',
-  // label: 'What type of countertop?',
-  options: [
-    'Concrete',
-    'Granite',
-    'Laminate',
-    'Marble',
-    'Quartz',
-    'Stainless Steel',
-    'Wood',
-    'Not Sure or Other'
-  ]
-});
+const deckWorkType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of work?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Deck_Work_Type" : "Deck_Work_Type",
+        options: ["Paint or Stain", "Install or Replace", "Repair", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const deckWorkType$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Deck_Work_Type' : 'Deck_Work_Type',
-  // label: 'What type of work do you need?',
-  options: [
-    'Paint or Stain',
-    'Install or Replace',
-    'Repair',
-    'Not Sure or Other'
-  ]
-});
+const demolitionSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of demolition?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Demolition_Subtype" : "Demolition_Subtype",
+        options: ["Whole Structure", "Partial Home", "Shed", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const demolitionSubtype$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Demolition_Subtype' : 'Demolition_Subtype',
-  // label: 'What type of demolition?',
-  options: [
-    'Whole Structure',
-    'Partial Home',
-    'Shed',
-    'Not Sure or Other'
-  ]
-});
-  
-const doorSubtype$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Door_Subtype' : 'Door_Subtype',
-  // label: 'What type of door?',
-  options: [
-    'Interior',
-    'Exterior',
-    'Garage',
-    'Sliding',
-    'Storm',
-    'Not Sure or Other'
-  ]
-});
+const doorSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of door?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Door_Subtype" : "Door_Subtype",
+        options: ["Interior", "Exterior", "Garage", "Sliding", "Storm", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const drivewayWorkType$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Driveway_Work_Type' : 'Driveway_Work_Type',
-  // label: 'What type of work do you need?',
-  options: [
-    'Install or Replace',
-    'Repair',
-    'Sealing',
-    'Not Sure or Other'
-  ]
-});
+const drivewayWorkType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of work?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Driveway_Work_Type" : "Driveway_Work_Type",
+        options: ["Install or Replace", "Repair", "Sealing", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const drivewayMaterial$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Driveway_Material' : 'Driveway_Material',
-  // label: 'What type of driveway material?',
-  options: [
-    'Asphalt',
-    'Brick',
-    'Cobblestone',
-    'Pebble',
-    'Concrete',
-    'Pavers',
-    'Not Sure or Other'
-  ]
-});
+const drivewayMaterial$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What driveway material?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Driveway_Material" : "Driveway_Material",
+        options: ["Asphalt", "Brick", "Cobblestone", "Pebble", "Concrete", "Pavers", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const wallSurfaceType$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Wall_Surface_Type' : 'Wall_Surface_Type',
-  // label: 'What type of surface?',
-  options: [
-    'Drywall',
-    'Plaster',
-    'Stucco',
-    'Not Sure or Other'
-  ]
-});
+const wallSurfaceType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What surface type?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Wall_Surface_Type" : "Wall_Surface_Type",
+        options: ["Drywall", "Plaster", "Stucco", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const electricalSubtype$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Electrical_Subtype' : 'Electrical_Subtype',
-  // label: 'What type of electrical work do you need?',
-  options: [
-    'Electrical Panel',
-    'Outlets and Fixtures',
-    'Home Theater',
-    'Exhaust Fans',
-    'Ceiling Fans',
-    'EV Charging Station',
-    'Addition or Remodel',
-    'Generator',
-    'Outdoor Lighting',
-    'Pet Fence',
-    'Thermostat',
-    'Wall or Baseboard Heater',
-    'Holiday Lighting',
-    'Not Sure or Other'
-  ]
-});
+const electricalSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What electrical job type?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Electrical_Subtype" : "Electrical_Subtype",
+        options: [
+          "Electrical Panel",
+          "Outlets and Fixtures",
+          "Home Theater",
+          "Exhaust Fans",
+          "Ceiling Fans",
+          "EV Charging Station",
+          "Addition or Remodel",
+          "Generator",
+          "Outdoor Lighting",
+          "Pet Fence",
+          "Thermostat",
+          "Wall or Baseboard Heater",
+          "Holiday Lighting",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const fenceMaterial$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Fence_Material' : 'Fence_Material',
-  // label: 'What type of fence material?',
-  options: [
-    'Aluminum',
-    'Chain Link',
-    'Wood',
-    'Wire',
-    'Vinyl',
-    'Iron',
-    'Not Sure or Other'
-  ]
-});
+const fenceMaterial$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What fence material?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Fence_Material" : "Fence_Material",
+        options: ["Aluminum", "Chain Link", "Wood", "Wire", "Vinyl", "Iron", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const flooringMaterial$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Flooring_Material' : 'Flooring_Material',
-  // label: 'What type of flooring material?',
-  options: [
-    'Carpet',
-    'Concrete',
-    'Hardwood',
-    'Laminate',
-    'Linoleum',
-    'Slate',
-    'Tile',
-    'Vinyl',
-    'Not Sure or Other'
-  ]
-});
+const flooringMaterial$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsSelect;
+  const label = vertical ? updates.label : "What flooring material?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Flooring_Material" : "Flooring_Material",
+        options: [
+          "Carpet",
+          "Concrete",
+          "Hardwood",
+          "Laminate",
+          "Linoleum",
+          "Slate",
+          "Tile",
+          "Vinyl",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const generalContractorSubtype$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'General_Contractor_Subtype' : 'General_Contractor_Subtype',
-  // label: 'What type of general contractor work do you need?',
-  options: [
-    'Remodeling',
-    'Additions',
-    'Major Home Repairs',
-    'Excavation',
-    'Demolition',
-    'Dumpster Rental',
-    'Not Sure or Other'
-  ]
-});
+const generalContractorSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? col2RadioCenter : sbsRadio;
+  const label = vertical ? updates.label : "What contractor job type?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "General_Contractor_Subtype" : "General_Contractor_Subtype",
+        options: [
+          "Remodeling",
+          "Additions",
+          "Major Home Repairs",
+          "Excavation",
+          "Demolition",
+          "Dumpster Rental",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const gutterMaterial$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Gutter_Material' : 'Gutter_Material',
-  // label: 'What type of gutter material?',
-  options: [
-    'Galvanized',
-    'Metal',
-    'PVC',
-    'Wood',
-    'Not Sure or Other'
-  ]
-});
+const gutterMaterial$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? col2RadioCenter : sbsRadio;
+  const label = vertical ? updates.label : "What gutter material?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Gutter_Material" : "Gutter_Material",
+        options: ["Galvanized", "Metal", "PVC", "Wood", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const guttersWorkType$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Gutters_Work_Type' : 'Gutters_Work_Type',
-  options: [
-    'Install or Replace',
-    'Repair',
-    'Cleaning',
-    'Not Sure or Other'
-  ]
-});
+const gutterWorkType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of work?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Gutter_Work_Type" : "Gutter_Work_Type",
+        options: ["Install or Replace", "Repair", "Cleaning", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const smartHomeSubtype$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Smart_Home_Subtype' : 'Smart_Home_Subtype',
-  // label: 'What type of smart home work do you need?',
-  options: [
-    'Thermostats',
-    'Video Doorbells',
-    'Camera Systems',
-    'Lighting',
-    'Speaker Systems',
-    'Not Sure or Other'
-  ]
-});
+const smartHomeSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What smart home job type?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Smart_Home_Subtype" : "Smart_Home_Subtype",
+        options: [
+          "Thermostats",
+          "Video Doorbells",
+          "Camera Systems",
+          "Lighting",
+          "Speaker Systems",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const homeOrganizationSubtype$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Home_Organization_Subtype' : 'Home_Organization_Subtype',
-  // label: 'What type of home organization work do you need?',
-  options: [
-    'Packing or Unpacking',
-    'Room Organization',
-    'Shed Organization',
-    'Storage Solutions',
-    'Decluttering',
-    'Not Sure or Other'
-  ]
-});
+const homeOrganizationSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What home organization job?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Home_Organization_Subtype" : "Home_Organization_Subtype",
+        options: [
+          "Packing or Unpacking",
+          "Room Organization",
+          "Shed Organization",
+          "Storage Solutions",
+          "Decluttering",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const numberOfRooms$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Number_Of_Rooms' : 'Number_Of_Rooms',
-  // label: 'How many rooms?',
-  options: [
-    '1',
-    '2',
-    '3',
-    '4',
-    '5 or more'
-  ]
-});
+const numberOfRooms$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "How many rooms?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Number_Of_Rooms" : "Number_Of_Rooms",
+        options: ["1-2", "3-4", "4-5", "5-6", "6+"],
+      },
+      updates
+    )
+  )
+};
 
-const homeTheaterSubtype$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Home_Theater_Subtype' : 'Home_Theater_Subtype',
-  // label: 'What type of home theater work do you need?',
-  options: [
-    'Hang TV',
-    'Install Sound System',
-    'Wiring',
-    'Troubleshooting',
-    'Not Sure or Other'
-  ]
-});
+const homeTheaterSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What home theater job?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Home_Theater_Subtype" : "Home_Theater_Subtype",
+        options: ["Hang TV", "Install Sound System", "Wiring", "Troubleshooting", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const heatingCoolingSubtype$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Heating_Cooling_Subtype' : 'Heating_Cooling_Subtype',
-  // label: 'What type of heating and cooling work do you need?',
-  options: [
-    'Central Air',
-    'Humidifier',
-    'Ducts and Vents',
-    'Furnace',
-    'Heat Pump',
-    'Radiant Floor',
-    'Swamp Cooler',
-    'Not Sure or Other'
-  ]
-});
+const heatingCoolingSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What heating or cooling job?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Heating_Cooling_Subtype" : "Heating_Cooling_Subtype",
+        options: [
+          "Central Air",
+          "Humidifier",
+          "Ducts and Vents",
+          "Furnace",
+          "Heat Pump",
+          "Radiant Floor",
+          "Swamp Cooler",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const fuelSource$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Fuel_Source' : 'Fuel_Source',
-  // label: 'What is the fuel source?',
-  options: [
-    'Gas',
-    'Oil',
-    'Electric',
-    'Propane',
-    'Not Sure or Other'
-  ]
-});
+const fuelSource$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsSelect;
+  const label = vertical ? updates.label : "What is the fuel source?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Fuel_Source" : "Fuel_Source",
+        options: ["Gas", "Oil", "Electric", "Propane", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const insulationSubtype$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Insulation_Subtype' : 'Insulation_Subtype',
-  // label: 'What type of insulation work do you need?',
-  options: [
-    'Batt or Roll',
-    'Spray Foam',
-    'Blown-in',
-    'Reflective',
-    'Not Sure or Other'
-  ]
-});
+const insulationSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of insulation job?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Insulation_Subtype" : "Insulation_Subtype",
+        options: ["Batt or Roll", "Spray Foam", "Blown-in", "Reflective", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const landscapingSubtype$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Landscaping_Subtype' : 'Landscaping_Subtype',
-  // label: 'What type of landscaping work do you need?',
-  options: [
-    'Lawn Mowing',
-    'Lawn Care or Fertilization',
-    'Yard or Leaf Cleanup',
-    'Patios or Walkways',
-    'Stonework',
-    'Architects',
-    'Landscape Construction',
-    'Outdoor Lighting',
-    'Grading',
-    'Materials Delivery',
-    'Spinklers'
-  ]
-});
+const landscapingSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What landscaping job?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Landscaping_Subtype" : "Landscaping_Subtype",
+        options: [
+          "Lawn Mowing",
+          "Lawn Care or Fertilization",
+          "Yard or Leaf Cleanup",
+          "Patios or Walkways",
+          "Stonework",
+          "Architects",
+          "Landscape Construction",
+          "Outdoor Lighting",
+          "Grading",
+          "Materials Delivery",
+          "Spinklers",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const masonrySubtype$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Masonry_Subtype' : 'Masonry_Subtype',
-  // label: 'What type of masonry work do you need?',
-  options: [
-    'Driveways',
-    'Walkways',
-    'Floors',
-    'Walls',
-    'Facades',
-    'Material Delivery',
-    'Not Sure or Other'
-  ]
-});
+const masonrySubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsSelect;
+  const label = vertical ? updates.label : "What masonry job?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Masonry_Subtype" : "Masonry_Subtype",
+        options: ["Driveways", "Walkways", "Floors", "Walls", "Facades", "Material Delivery", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const masonryMaterial$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Masonry_Material' : 'Masonry_Material',
-  // label: 'What type of masonry material?',
-  options: [
-    'Brick or Stone',
-    'Pavers',
-    'Concrete',
-    'Not Sure or Other'
-  ]
-});
+const masonryMaterial$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What masonry material?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Masonry_Material" : "Masonry_Material",
+        options: ["Brick or Stone", "Pavers", "Concrete", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const masonryWorkType$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Masonry_Work_Type' : 'Masonry_Work_Type',
-  // label: 'What type of masonry work do you need?',
-  options: [
-    'Install or Replace',
-    'Repoint Brick or Stone',
-    'Repair',
-    'Not Sure or Other'
-  ]
-});
+const masonryWorkType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of work?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Masonry_Work_Type" : "Masonry_Work_Type",
+        options: ["Install or Replace", "Repoint Brick or Stone", "Repair", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const restorationSubtype$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Restoration_Subtype' : 'Restoration_Subtype',
-  // label: 'What type of restoration work do you need?',
-  options: [
-    'Mold Remediation',
-    'Fire Damage',
-    'Water Damage',
-    'Not Sure or Other'
-  ]
-});
+const restorationSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What restoration job?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Restoration_Subtype" : "Restoration_Subtype",
+        options: ["Mold Remediation", "Fire Damage", "Water Damage", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
 // TODO: need to finalize support for moving
 
@@ -800,227 +1067,294 @@ const restorationSubtype$1 = (scope) => verticalRadio({
 //   ]
 // })
 
-const paintingSubtype$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Painting_Subtype' : 'Painting_Subtype',
-  // label: 'What type of painting work do you need?',
-  options: [
-    'Whole Exterior',
-    'Exterior Touch-up',
-    'Interior Rooms',
-    'Interior Touch-up',
-    'Ceilings',
-    'Deck',
-    'Shed',
-    'Cabinets',
-    'Not Sure or Other'
-  ]
-});
-
-const paintingRooms$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Painting_Rooms' : 'Painting_Rooms',
-  // label: 'How many rooms need painting?',
-  options: [
-    '1-2',
-    '3-4',
-    '4-5',
-    '5-6',
-    '6+'
-  ]
-});
+const paintingSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What painting job type?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Painting_Subtype" : "Painting_Subtype",
+        options: [
+          "Whole Exterior",
+          "Exterior Touch-up",
+          "Interior Rooms",
+          "Interior Touch-up",
+          "Ceilings",
+          "Deck",
+          "Shed",
+          "Cabinets",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const pestControlSubtype$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Pest_Control_Subtype' : 'Pest_Control_Subtype',
-  // label: 'What type of pest control work do you need?',
-  options: [
-    'Bed Bugs',
-    'Flying Animals',
-    'Insects',
-    'Rodents',
-    'Small Animals',
-    'Bees',
-    'Termites',
-    'Not Sure or Other'
-  ]
-});
+const pestControlSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What pest control job type?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Pest_Control_Subtype" : "Pest_Control_Subtype",
+        options: [
+          "Bed Bugs",
+          "Flying Animals",
+          "Insects",
+          "Rodents",
+          "Small Animals",
+          "Bees",
+          "Termites",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const poolsWorkType$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Pools_Work_Type' : 'Pools_Work_Type',
-  // label: 'What type of pool work do you need?',
-  options: [
-    'Install or Replace',
-    'Repair',
-    'Cleaning',
-    'Close or Open Pool',
-    'Not Sure or Other'
-  ]
-});
+const poolsWorkType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of work?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Pools_Work_Type" : "Pools_Work_Type",
+        options: ["Install or Replace", "Repair", "Cleaning", "Close or Open Pool", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const poolsSubtype$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Pools_Subtype' : 'Pools_Subtype',
-  // label: 'What type of pool do you have?',
-  options: [
-    'Above Ground',
-    'Inground Concrete',
-    'Inground Fiberglass',
-    'Inground Vinyl',
-    'Inground Gunite',
-    'Pool Liners',
-    'Pool Filters',
-    'Not Sure or Other'
-  ]
-});
+const poolsSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What type of pool?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Pools_Subtype" : "Pools_Subtype",
+        options: [
+          "Above Ground",
+          "Inground Concrete",
+          "Inground Fiberglass",
+          "Inground Vinyl",
+          "Inground Gunite",
+          "Pool Liners",
+          "Pool Filters",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const plumbingSubtype$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Plumbing_Subtype' : 'Plumbing_Subtype',
-  // label: 'What type of plumbing work do you need?',
-  options: [
-    'Tub or Shower',
-    'Drain',
-    'Sink',
-    'Toilet',
-    'Boiler',
-    'Water Heater',
-    'Sump Pump',
-    'Piping',
-    'Septic',
-    'Water Main',
-    'Hot Tub',
-    'Additions and Remodels',
-    'Not Sure or Other'
-  ]
-});
+const plumbingSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What plumbing job type?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Plumbing_Subtype" : "Plumbing_Subtype",
+        options: [
+          "Tub or Shower",
+          "Drain",
+          "Sink",
+          "Toilet",
+          "Boiler",
+          "Water Heater",
+          "Sump Pump",
+          "Piping",
+          "Septic",
+          "Water Main",
+          "Hot Tub",
+          "Additions and Remodels",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const remodelingSubtype$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Remodeling_Subtype' : 'Remodeling_Subtype',
-  // label: 'What type of remodeling work do you need?',
-  options: [
-    'Interior Designer',
-    'Interior Decorator',
-    'Kitchen Remodeling',
-    'Bathroom Remodeling',
-    'Garage Remodeling',
-    'Home Remodeling',
-    'Dumpster Rental',
-    'Landscape Architect',
-    'Outdoor Kitchen',
-    'Outdoor Enclosure',
-    'Additions',
-    'Not Sure or Other'
-  ]
-});
+const remodelingSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What remodeling job?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Remodeling_Subtype" : "Remodeling_Subtype",
+        options: [
+          "Interior Designer",
+          "Interior Decorator",
+          "Kitchen Remodeling",
+          "Bathroom Remodeling",
+          "Garage Remodeling",
+          "Home Remodeling",
+          "Dumpster Rental",
+          "Landscape Architect",
+          "Outdoor Kitchen",
+          "Outdoor Enclosure",
+          "Additions",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const roofingWorkType$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Roofing_Work_Type' : 'Roofing_Work_Type',
-  // label: 'What type of roofing work do you need?',
-  options: [
-    'Install or Replace Roof',
-    'Repair Roof',
-    'Ice Dams',
-    'Gutters',
-    'Not Sure or Other'
-  ]
-});
+const roofingWorkType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of work?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Roofing_Work_Type" : "Roofing_Work_Type",
+        options: ["Install or Replace Roof", "Repair Roof", "Ice Dams", "Gutters", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const roofingMaterial$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Roofing_Material' : 'Roofing_Material',
-  // label: 'What type of roofing material?',
-  options: [
-    'Asphalt Shingle',
-    'Metal',
-    'Composite',
-    'Flat',
-    'Foam',
-    'Tile',
-    'Wood',
-    'Slate',
-    'Not Sure or Other'
-  ]
-});
+const roofingMaterial$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What roofing material?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Roofing_Material" : "Roofing_Material",
+        options: [
+          "Asphalt Shingle",
+          "Metal",
+          "Composite",
+          "Flat",
+          "Foam",
+          "Tile",
+          "Wood",
+          "Slate",
+          "Not Sure or Other",
+        ],
+      },
+      updates
+    )
+  )
+};
 
-const sidingMaterial$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Siding_Material' : 'Siding_Material',
-  // label: 'What type of siding material?',
-  options: [
-    'Vinyl',
-    'Composite',
-    'Brick',
-    'Stone',
-    'Wood',
-    'Stucco',
-    'Not Sure or Other'
-  ]
-});
+const sidingMaterial$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? col2RadioCenter : sbsSelect;
+  const label = vertical ? updates.label : "What siding material?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Siding_Material" : "Siding_Material",
+        options: ["Vinyl", "Composite", "Brick", "Stone", "Wood", "Stucco", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const tilingSubtype$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Tiling_Subtype' : 'Tiling_Subtype',
-  // label: 'What type of tiling work do you need?',
-  options: [
-    'Floor',
-    'Backsplash',
-    'Bathroom',
-    'Wall',
-    'Not Sure or Other'
-  ]
-});
+const tilingSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What tiling job type?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Tiling_Subtype" : "Tiling_Subtype",
+        options: ["Floor", "Backsplash", "Bathroom", "Wall", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const waterproofingSubtype$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Waterproofing_Subtype' : 'Waterproofing_Subtype',
-  // label: 'What type of waterproofing work do you need?',
-  options: [
-    'Foundations',
-    'Basements',
-    'Drainage',
-    'Not Sure or Other'
-  ]
-});
+const waterproofingSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What waterproofing job?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Waterproofing_Subtype" : "Waterproofing_Subtype",
+        options: ["Foundations", "Basements", "Drainage", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const windowsWorkType$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Windows_Work_Type' : 'Windows_Work_Type',
-  // label: 'What type of windows work do you need?',
-  options: [
-    'Install or Replace',
-    'Repair',
-    'Cleaning',
-    'Not Sure or Other'
-  ]
-});
+const windowsWorkType$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "What type of work?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Windows_Work_Type" : "Windows_Work_Type",
+        options: ["Install or Replace", "Repair", "Cleaning", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const windowsSubtype$1 = (scope) => verticalSelect({
-  name: scope ? scope + ':' + 'Windows_Subtype' : 'Windows_Subtype',
-  // label: 'What type of windows do you have?',
-  options: [
-    'Whole Windows',
-    'Frames',
-    'Glass',
-    'Hardware',
-    'Storm Windows',
-    'Screens',
-    'Not Sure or Other'
-  ]
-});
+const windowsSubtype$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "What windows job type?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Windows_Subtype" : "Windows_Subtype",
+        options: ["Whole Windows", "Frames", "Glass", "Hardware", "Storm Windows", "Screens", "Not Sure or Other"],
+      },
+      updates
+    )
+  )
+};
 
-const numberOfWindows$1 = (scope) => verticalRadio({
-  name: scope ? scope + ':' + 'Number_Of_Windows' : 'Number_Of_Windows',
-  // label: 'How many windows?',
-  options: [
-    '1',
-    '2',
-    '3-5',
-    '6+'
-  ]
-});
+const numberOfWindows$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalRadio : sbsRadio;
+  const label = vertical ? updates.label : "How many windows?";
+  return func(
+    merge(
+      {
+        label,
+        name: scope ? scope + ":" + "Number_Of_Windows" : "Number_Of_Windows",
+        options: ["1", "2", "3-5", "6+"],
+      },
+      updates
+    )
+  )
+};
 
-const NEXT_ON_ENTER = '$onEnter($setNextStep($fireStepEvent($get(form)), $preStepFunc($get(form))))';
-const NEXT_ON_INPUT = '$onInput($setNextStep($fireStepEvent($get(form)), $preStepFunc($get(form))))';
+const NEXT_ON_ENTER = "$onEnter($setNextStep($fireStepEvent($get(form)), $preStepFunc($get(form))))";
+const NEXT_ON_INPUT = "$onInput($setNextStep($fireStepEvent($get(form)), $preStepFunc($get(form))))";
 
-const isInput = (n) => { return (n.type !== 'group' && n.type !== 'section' && n.type !== 'form' && n.$formkit !== 'hidden' && !n.children) };
+const isInput = (n) => {
+  return n.type !== "group" && n.type !== "section" && n.type !== "form" && n.$formkit !== "hidden" && !n.children
+};
 
 const findLastInput = (n) => {
   if (isInput(n)) {
     return n
   }
   for (var i = n.children.length - 1; i >= 0; i--) {
-    if (typeof n.children === 'string') {
+    if (typeof n.children === "string") {
       continue
     }
     const child = n.children[i];
@@ -1036,99 +1370,114 @@ const findLastInput = (n) => {
 };
 
 const secureIconDefault = {
-  $el: 'div',
-  if: '$activeStep === $lastStep()',
+  $el: "div",
+  if: "$activeStep === $lastStep()",
   attrs: {
-    class: 't-flex t-justify-center t-items-center t-text-sm t-text-gray-500'
+    class: "t-flex t-justify-center t-items-center t-text-sm t-text-gray-500",
   },
   children: [
     {
-      $el: 'img',
+      $el: "img",
       attrs: {
-        loading: 'lazy',
-        alt: '',
+        loading: "lazy",
+        alt: "",
         style: {
-          border: 0
+          border: 0,
         },
-        width: '25',
-        height: '25',
-        src: 'https://d27hmee62k45vz.cloudfront.net/lock_icon_1.jpeg',
-      }
+        width: "25",
+        height: "25",
+        src: "https://d27hmee62k45vz.cloudfront.net/lock_icon_1.jpeg",
+      },
     },
     {
-      $el: 'span',
-      children: 'Secure & Encrypted',
+      $el: "span",
+      children: "Secure & Encrypted",
       attrs: {
-        class: 't-pl-2 t-pt-1 t-font-medium'
-      }
-    }
-  ]
+        class: "t-pl-2 t-pt-1 t-font-medium",
+      },
+    },
+  ],
 };
 
 function secureIcon(updates) {
-  return merge(
-    secureIconDefault,
-    updates
-  )
+  return merge(secureIconDefault, updates)
 }
 
 function verticalStepHeadline(updates) {
   return {
-    $el: 'h3',
-    children: updates.headline || 'Tell Us About Your Situation',
+    $el: "h3",
+    children: updates.headline || "Tell Us About Your Situation",
     attrs: {
-      class: 't-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-dark t-pb-5 t-pt-0 t-px-1' + ' ' + (updates.headlineClass || '')
-    }
+      class:
+        "t-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-dark t-pb-5 t-pt-0 t-px-1" +
+        " " +
+        (updates.headlineClass || ""),
+    },
   }
 }
 
 function verticalStepSubHeadline(updates) {
   return {
-    $el: 'h5',
-    children: updates.subheadline || '',
+    $el: "h5",
+    children: updates.subheadline || "",
     attrs: {
-      class: 't-flex t-justify-center t-text-center !t-text-lg t-font-normal t-text-dark t-pb-5 t-pt-0 t-px-1' + ' ' + (updates.subheadlineClass || '')
-    }
+      class:
+        "t-flex t-justify-center t-text-center !t-text-lg t-font-normal t-text-dark t-pb-5 t-pt-0 t-px-1" +
+        " " +
+        (updates.subheadlineClass || ""),
+    },
   }
 }
 
 function commentsStepHeadline(updates) {
   return {
-    $el: 'h3',
-    children: updates.headline || 'Additional Details',
+    $el: "h3",
+    children: updates.headline || "Additional Details",
     attrs: {
-      class: 't-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-5 t-pt-0 t-px-1' + ' ' + (updates.headlineClass || '')
-    }
+      class:
+        "t-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-5 t-pt-0 t-px-1" +
+        " " +
+        (updates.headlineClass || ""),
+    },
   }
 }
 
 function firstAndLastStepHeadline(updates) {
   return {
-    $el: 'h3',
-    children: updates.headline || 'Please Provide a Contact Name',
+    $el: "h3",
+    children: updates.headline || "Please Provide a Contact Name",
     attrs: {
-      class: 't-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-5 t-pt-0 t-px-1' + ' ' + (updates.headlineClass || '')
-    }
+      class:
+        "t-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-5 t-pt-0 t-px-1" +
+        " " +
+        (updates.headlineClass || ""),
+    },
   }
 }
 
 function contactStepHeadline(updates) {
   return {
-    $el: 'h3',
+    $el: "h3",
     children: updates.headline || DEFAULT_FINAL_HEADLINE_DYNAMIC_LEGAL,
     attrs: {
-      class: 't-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-3 t-pt-0 t-px-1' + ' ' + (updates.headlineClass || '')
-    }
+      class:
+        "t-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-3 t-pt-0 t-px-1" +
+        " " +
+        (updates.headlineClass || ""),
+    },
   }
 }
 
 function contactStepSubHeadline(updates) {
   return {
-    $el: 'h5',
+    $el: "h5",
     children: updates.subheadline || DEFAULT_FINAL_SUBHEADLINE_DYNAMIC_LEGAL,
     attrs: {
-      class: 't-flex t-justify-center t-text-center !t-text-lg t-font-semibold t-pb-7 t-pt-0 t-px-3' + ' ' + (updates.subheadlineClass || '')
-    }
+      class:
+        "t-flex t-justify-center t-text-center !t-text-lg t-font-semibold t-pb-7 t-pt-0 t-px-3" +
+        " " +
+        (updates.subheadlineClass || ""),
+    },
   }
 }
 
@@ -1150,19 +1499,19 @@ const TRUSTED_FORM_JS = `(function() {
 
 function trustedFormScript() {
   return {
-    $el: 'script',
-    if: '$activeStep === $lastStep()',
-    children: TRUSTED_FORM_JS
+    $el: "script",
+    if: "$activeStep === $lastStep()",
+    children: TRUSTED_FORM_JS,
   }
 }
 
 const stepDefaults = (step, stepKey) => ({
-  $el: 'section',
+  $el: "section",
   if: '$stepEnabled("' + step + '")',
   attrs: {
     hidden: '$activeStep !== "' + step + '"',
-    key: stepKey ? stepKey : step
-  }
+    key: stepKey ? stepKey : step,
+  },
 });
 
 function step(name, inputs, updates = {}) {
@@ -1185,49 +1534,48 @@ function step(name, inputs, updates = {}) {
     }
   }
 
-  return merge(
-    stepDefaults(name, stepKey),
-    {
-      children: [
-        {
-          $formkit: 'group',
-          id: name,
-          name: name,
-          nextStepMap: nextStepMap,
-          triggerRedirectMap: triggerRedirectMap,
-          autoFocus: autoFocus,
-          children: inputs
-        }
-      ]
-    }
-  )
+  return merge(stepDefaults(name, stepKey), {
+    children: [
+      {
+        $formkit: "group",
+        id: name,
+        name: name,
+        nextStepMap: nextStepMap,
+        triggerRedirectMap: triggerRedirectMap,
+        autoFocus: autoFocus,
+        children: inputs,
+      },
+    ],
+  })
 }
 
 // Single question step
 function sqstep(name, input, defaultHeadline, updates = {}) {
-  if (typeof updates.nextOnInput === 'undefined') {
+  if (typeof updates.nextOnInput === "undefined") {
     updates.nextOnInput = true;
   }
-  
+
   return step(
     name,
     [
-      verticalStepHeadline({ headline: updates.headline ?? defaultHeadline, headlineClass: updates.headlineClass }),
-      ...Array.isArray(input) ? input : [input],
+      verticalStepHeadline({
+        headline: updates.headline ?? defaultHeadline,
+        headlineClass: updates.headlineClass,
+      }),
+      ...(Array.isArray(input) ? input : [input]),
     ],
     updates
   )
 }
 
-
 // ------ Common Steps
 
 function address(updates = {}) {
-  updates.nextOnInput = typeof updates.nextOnInput === 'undefined' ? false : updates.nextOnInput;
+  updates.nextOnInput = typeof updates.nextOnInput === "undefined" ? false : updates.nextOnInput;
   return sqstep(
-    'address',
-    address$1(updates.scope, true),
-    'What is the street address of the home?',
+    "address",
+    address$1(updates.scope, true, updates.input),
+    "What is the street address of the home?",
     updates
   )
 }
@@ -1236,14 +1584,14 @@ function commentsHeadline(updates = {}) {
   const mergedUpdates = { ...updates, nextOnEnter: false };
 
   return step(
-    'comments',
+    "comments",
     [
       commentsStepHeadline(updates),
-      comments({
-        label: typeof updates.label === 'undefined' ? DEFAULT_COMMENTS_LABEL : updates.label,
+      comments(updates.scope, false, {
+        label: typeof updates.label === "undefined" ? DEFAULT_COMMENTS_LABEL : updates.label,
         placeholder: updates.placeholder || DEFAULT_COMMENTS_PLACEHOLDER_DYNAMIC,
-        inputClass: typeof updates.inputClass === 'undefined' ? '!t-h-32' : updates.inputClass,
-      }, updates.scope),
+        inputClass: typeof updates.inputClass === "undefined" ? "!t-h-32" : updates.inputClass,
+      }),
     ],
     mergedUpdates
   )
@@ -1251,7 +1599,7 @@ function commentsHeadline(updates = {}) {
 
 function contactInfo(updates = {}) {
   return step(
-    'contactInfo',
+    "contactInfo",
     [
       contactStepHeadline(updates),
       contactStepSubHeadline(updates),
@@ -1259,676 +1607,330 @@ function contactInfo(updates = {}) {
       email(updates.scope),
       phone(updates.scope),
       TCPAConsent(updates.scope),
-      secureIcon()
+      secureIcon(),
     ],
     { nextOnEnter: false }
   )
 }
 
-function firstAndLastV3(updates = {}, scope) {
+function firstAndLastV3(updates = {}) {
   return step(
-    'firstAndLast',
+    "firstAndLast",
     [
       firstAndLastStepHeadline({
-        headline: updates.headline ?? 'Who is looking for help?',
-        headlineClass: updates.headlineClass
+        headline: updates.headline ?? "Who is looking for help?",
+        headlineClass: updates.headlineClass,
       }),
       verticalStepSubHeadline({
-        subheadline: updates.subheadline ?? 'Note: we never share info without consent',
-        subheadlineClass: '!t-text-sm !t-text-gray-500'
+        subheadline: updates.subheadline ?? "Note: we never share info without consent",
+        subheadlineClass: "!t-text-sm !t-text-gray-500",
       }),
-      firstName(scope),
-      lastName(scope)
+      firstName(updates.scope),
+      lastName(updates.scope),
     ],
     updates
   )
 }
 
 function zipcode(updates = {}) {
-  return sqstep(
-    'zipcode',
-    zipcode$1(updates.scope, true, updates),
-    'Please verify your Zip Code',
-    updates
-  )
+  return sqstep("zipcode", zipcode$1(updates.scope, true, updates.input), "Please verify your Zip Code", updates)
 }
 
-// export function electricalCrossSellQuestions(updates = {}) {
-//   return step(
-//     'electricalCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Pro Electrician' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your electrical needs:' }),
-//       inp.ElectricalQuestions("true", 'CrossSell:Electrical'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//         'CrossSell:Electrical'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function appliancesCrossSellQuestions(updates = {}) {
-//   return step(
-//     'appliancesCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With An Appliance Pro' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your appliance needs:' }),
-//       inp.AppliancesQuestions("true", 'CrossSell:Appliances'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//         'CrossSell:Appliances'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function carpentryCrossSellQuestions(updates = {}) {
-//   return step(
-//     'carpentryCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Pro Carpenter' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your carpentry needs:' }),
-//       inp.CarpentryQuestions("true", 'CrossSell:Carpentry'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//         'CrossSell:Carpentry'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function masonryAndConcreteCrossSellQuestions(updates = {}) {
-//   return step(
-//     'masonryCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Masonry Pro' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your masonry needs:' }),
-//       inp.MasonryAndConcreteQuestions("true", 'CrossSell:Masonry and Concrete'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//         'CrossSell:Masonry and Concrete'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function drivewaysCrossSellQuestions(updates = {}) {
-//   return step(
-//     'drivewayCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Driveway Pro' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your driveway needs:' }),
-//       inp.DrivewaysQuestions("true", 'CrossSell:Driveways'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//         'CrossSell:Driveways'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function drywallAndPlasterCrossSellQuestions(updates = {}) {
-//   return step(
-//     'drywallCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Drywall Pro' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your drywall needs:' }),
-//       inp.DrywallAndPlasterQuestions("true", 'CrossSell:Drywall and Plaster'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//         'CrossSell:Drywall and Plaster'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function heatingAndCoolingCrossSellQuestions(updates = {}) {
-//   return step(
-//     'heatingCoolingCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With An HVAC Pro' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your heating and cooling needs:' }),
-//       inp.HeatingAndCoolingQuestions("true", 'CrossSell:Heating and Cooling'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//         },
-//         'CrossSell:Heating and Cooling'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function landscapingCrossSellQuestions(updates = {}) {
-//   return step(
-//     'landscapingCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Landscaping Pro' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your landscaping needs:' }),
-//       inp.LandscapingQuestions("true", 'CrossSell:Landscaping'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//         },
-//         'CrossSell:Landscaping'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function pestControlCrossSellQuestions(updates = {}) {
-//   return step(
-//     'pestControlCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Pest Control Pro' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your pest control needs:' }),
-//       inp.PestControlQuestions("true", 'CrossSell:Pest Control'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//         },
-//         'CrossSell:Pest Control'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function sidingCrossSellQuestions(updates = {}) {
-//   return step(
-//     'sidingCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Siding Pro' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your siding needs:' }),
-//       inp.SidingQuestions("true", 'CrossSell:Siding'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//         },
-//         'CrossSell:Siding'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function windowsCrossSellQuestions(updates = {}) {
-//   return step(
-//     'windowsCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Window Pro' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your window needs:' }),
-//       inp.WindowsQuestions("true", 'CrossSell:Windows'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//         },
-//         'CrossSell:Windows'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function flooringCrossSellQuestions(updates = {}) {
-//   return step(
-//     'flooringCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Flooring Pro' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your flooring needs:' }),
-//       inp.FlooringQuestions("true", 'CrossSell:Flooring'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//         'CrossSell:Flooring'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function paintingCrossSellQuestions(updates = {}) {
-//   return step(
-//     'paintingCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Pro Painter' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your painting needs:' }),
-//       inp.PaintingQuestions("true", 'CrossSell:Painting'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//         'CrossSell:Painting'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function plumbingCrossSellQuestions(updates = {}) {
-//   return step(
-//     'plumbingCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Local Plumber' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your plumbing needs:' }),
-//       inp.PlumbingQuestions("true", 'CrossSell:Plumbing'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//         'CrossSell:Plumbing'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function remodelingCrossSellQuestions(updates = {}) {
-//   return step(
-//     'remodelingCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Pro Remodeler' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your remodeling needs:' }),
-//       inp.RemodelingQuestions("true", 'CrossSell:Remodeling'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//         'CrossSell:Remodeling'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
-// export function roofingCrossSellQuestions(updates = {}) {
-//   return step(
-//     'roofingCrossSellQuestions',
-//     [
-//       crossSellQuestionsStepHeadline({ headline: 'Connect With A Pro Roofer' }),
-//       crossSellQuestionsStepSubHeadline({ subheadline: 'Tell us about your roofing needs:' }),
-//       inp.RoofingQuestions("true", 'CrossSell:Roofing'),
-//       inp.comments(
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//         'CrossSell:Roofing'
-//       )
-//     ],
-//     updates
-//   )
-// }
-
 function homeImprovementCategory(updates = {}) {
-  return step(
-    'homeImprovementCategory',
-    [
-      homeImprovementCategory$1(updates.input),
-    ],
-    updates
-  )
+  return step("homeImprovementCategory", [homeImprovementCategory$1(updates.scope, true, updates.input)], updates)
 }
 
 function timeframe(updates = {}) {
   return sqstep(
-    'timeframe',
-    timeframe$1(),
-    'What is the project timeframe?',
+    "timeframe",
+    timeframe$1(updates.scope, true, updates.input),
+    "What is the project timeframe?",
     updates
   )
 }
 
 function ownHome(updates = {}) {
-  return sqstep(
-    'ownHome',
-    ownHome$1(),
-    'Do you own the home?',
-    updates
-  )
+  return sqstep("ownHome", ownHome$1(updates.scope, true, updates.input), "Do you own the home?", updates)
 }
 
 function additionsSubType(updates = {}) {
   return sqstep(
-    'additionsSubType',
-    additionsSubType$1(),
-    'What type of addition?',
+    "additionsSubType",
+    additionsSubType$1(updates.scope, true, updates.input),
+    "What type of addition?",
     updates
   )
 }
 
 function constructionAreaSize(updates = {}) {
   return sqstep(
-    'constructionAreaSize',
-    constructionAreaSize$1(),
-    'What is the size of the construction area?',
+    "constructionAreaSize",
+    constructionAreaSize$1(updates.scope, true, updates.input),
+    "What is the size of the construction area?",
     updates
   )
 }
 
 function homeImprovementWorkType(updates = {}) {
   return sqstep(
-    'homeImprovementWorkType',
-    homeImprovementWorkType$1(),
-    'What type of work?',
+    "homeImprovementWorkType",
+    homeImprovementWorkType$1(updates.scope, true, updates.input),
+    "What type of work?",
     updates
   )
 }
 
 function applianceType(updates = {}) {
   return sqstep(
-    'applianceType',
-    applianceType$1(),
-    'What type of appliance?',
+    "applianceType",
+    applianceType$1(updates.scope, true, updates.input),
+    "What type of appliance?",
     updates
   )
 }
 
 function cabinetWorkType(updates = {}) {
   return sqstep(
-    'cabinetWorkType',
-    cabinetWorkType$1(),
-    'What type of cabinet work?',
+    "cabinetWorkType",
+    cabinetWorkType$1(updates.scope, true, updates.input),
+    "What type of cabinet work?",
     updates
   )
 }
 
 function carpentrySubtype(updates = {}) {
   return sqstep(
-    'carpentrySubtype',
-    carpentrySubtype$1(),
-    'What type of carpentry work?',
+    "carpentrySubtype",
+    carpentrySubtype$1(updates.scope, true, updates.input),
+    "What carpentry job type?",
     updates
   )
 }
 
 function carpetWorkType(updates = {}) {
   return sqstep(
-    'carpetWorkType',
-    carpetWorkType$1(),
-    'What type of carpet work?',
+    "carpetWorkType",
+    carpetWorkType$1(updates.scope, true, updates.input),
+    "What type of carpet work?",
     updates
   )
 }
 
 function cleaningSubtype(updates = {}) {
   return sqstep(
-    'cleaningSubtype',
-    cleaningSubtype$1(),
-    'What type of cleaning?',
+    "cleaningSubtype",
+    cleaningSubtype$1(updates.scope, true, updates.input),
+    "What type of cleaning?",
     updates
   )
 }
 
 function countertopMaterial(updates = {}) {
   return sqstep(
-    'countertopMaterial',
-    countertopMaterial$1(),
-    'What type of countertop material?',
+    "countertopMaterial",
+    countertopMaterial$1(updates.scope, true, updates.input),
+    "What type of countertop material?",
     updates
   )
 }
 
 function deckWorkType(updates = {}) {
   return sqstep(
-    'deckWorkType',
-    deckWorkType$1(),
-    'What type of deck work?',
+    "deckWorkType",
+    deckWorkType$1(updates.scope, true, updates.input),
+    "What type of deck work?",
     updates
   )
 }
 
 function demolitionSubtype(updates = {}) {
   return sqstep(
-    'demolitionSubtype',
-    demolitionSubtype$1(),
-    'What type of demolition?',
+    "demolitionSubtype",
+    demolitionSubtype$1(updates.scope, true, updates.input),
+    "What type of demolition?",
     updates
   )
 }
 
 function doorSubtype(updates = {}) {
-  return sqstep(
-    'doorSubtype',
-    doorSubtype$1(),
-    'What type of door?',
-    updates
-  )
+  return sqstep("doorSubtype", doorSubtype$1(updates.scope, true, updates.input), "What type of door?", updates)
 }
 
 function drivewayWorkType(updates = {}) {
   return sqstep(
-    'drivewayWorkType',
-    drivewayWorkType$1(),
-    'What type of driveway work?',
+    "drivewayWorkType",
+    drivewayWorkType$1(updates.scope, true, updates.input),
+    "What type of driveway work?",
     updates
   )
 }
 
 function drivewayMaterial(updates = {}) {
   return sqstep(
-    'drivewayMaterial',
-    drivewayMaterial$1(),
-    'What type of driveway material?',
+    "drivewayMaterial",
+    drivewayMaterial$1(updates.scope, true, updates.input),
+    "What type of driveway material?",
     updates
   )
 }
 
 function wallSurfaceType(updates = {}) {
   return sqstep(
-    'wallSurfaceType',
-    wallSurfaceType$1(),
-    'What type of surface?',
+    "wallSurfaceType",
+    wallSurfaceType$1(updates.scope, true, updates.input),
+    "What type of surface?",
     updates
   )
 }
 
 function electricalSubtype(updates = {}) {
   return sqstep(
-    'electricalSubtype',
-    electricalSubtype$1(),
-    'What type of electrical work?',
+    "electricalSubtype",
+    electricalSubtype$1(updates.scope, true, updates.input),
+    "What electrical job type?",
     updates
   )
 }
 
 function fenceMaterial(updates = {}) {
   return sqstep(
-    'fenceMaterial',
-    fenceMaterial$1(),
-    'What type of fence material?',
+    "fenceMaterial",
+    fenceMaterial$1(updates.scope, true, updates.input),
+    "What type of fence material?",
     updates
   )
 }
 
 function flooringMaterial(updates = {}) {
   return sqstep(
-    'flooringMaterial',
-    flooringMaterial$1(),
-    'What type of flooring material?',
+    "flooringMaterial",
+    flooringMaterial$1(updates.scope, true, updates.input),
+    "What type of flooring material?",
     updates
   )
 }
 
 function generalContractorSubtype(updates = {}) {
   return sqstep(
-    'generalContractorSubtype',
-    generalContractorSubtype$1(),
-    'What type of general contractor work?',
+    "generalContractorSubtype",
+    generalContractorSubtype$1(updates.scope, true, updates.input),
+    "What type of general contractor work?",
     updates
   )
 }
 
 function gutterMaterial(updates = {}) {
   return sqstep(
-    'gutterMaterial',
-    gutterMaterial$1(),
-    'What type of gutter material?',
+    "gutterMaterial",
+    gutterMaterial$1(updates.scope, true, updates.input),
+    "What type of gutter material?",
     updates
   )
 }
 
-function guttersWorkType(updates = {}) {
+function gutterWorkType(updates = {}) {
   return sqstep(
-    'guttersWorkType',
-    guttersWorkType$1(),
-    'What type of gutter work?',
+    "gutterWorkType",
+    gutterWorkType$1(updates.scope, true, updates.input),
+    "What type of gutter work?",
     updates
   )
 }
 
 function smartHomeSubtype(updates = {}) {
   return sqstep(
-    'smartHomeSubtype',
-    smartHomeSubtype$1(),
-    'What type of smart home work?',
+    "smartHomeSubtype",
+    smartHomeSubtype$1(updates.scope, true, updates.input),
+    "What type of smart home work?",
     updates
   )
 }
 
 function homeOrganizationSubtype(updates = {}) {
   return sqstep(
-    'homeOrganizationSubtype',
-    homeOrganizationSubtype$1(),
-    'What type of home organization work?',
+    "homeOrganizationSubtype",
+    homeOrganizationSubtype$1(updates.scope, true, updates.input),
+    "What type of home organization work?",
     updates
   )
 }
 
 function numberOfRooms(updates = {}) {
-  return sqstep(
-    'numberOfRooms',
-    numberOfRooms$1(),
-    'How many rooms?',
-    updates
-  )
+  return sqstep("numberOfRooms", numberOfRooms$1(updates.scope, true, updates.input), "How many rooms?", updates)
 }
 
 function homeTheaterSubtype(updates = {}) {
   return sqstep(
-    'homeTheaterSubtype',
-    homeTheaterSubtype$1(),
-    'What type of home theater work?',
+    "homeTheaterSubtype",
+    homeTheaterSubtype$1(updates.scope, true, updates.input),
+    "What type of home theater work?",
     updates
   )
 }
 
 function heatingCoolingSubtype(updates = {}) {
   return sqstep(
-    'heatingCoolingSubtype',
-    heatingCoolingSubtype$1(),
-    'What type of heating and cooling work?',
+    "heatingCoolingSubtype",
+    heatingCoolingSubtype$1(updates.scope, true, updates.input),
+    "What heating or cooling job type?",
     updates
   )
 }
 
 function fuelSource(updates = {}) {
-  return sqstep(
-    'fuelSource',
-    fuelSource$1(),
-    'What type of fuel source?',
-    updates
-  )
+  return sqstep("fuelSource", fuelSource$1(updates.scope, true, updates.input), "What type of fuel source?", updates)
 }
 
 function insulationSubtype(updates = {}) {
   return sqstep(
-    'insulationSubtype',
-    insulationSubtype$1(),
-    'What type of insulation work?',
+    "insulationSubtype",
+    insulationSubtype$1(updates.scope, true, updates.input),
+    "What type of insulation work?",
     updates
   )
 }
 
 function landscapingSubtype(updates = {}) {
   return sqstep(
-    'landscapingSubtype',
-    landscapingSubtype$1(),
-    'What type of landscaping work?',
+    "landscapingSubtype",
+    landscapingSubtype$1(updates.scope, true, updates.input),
+    "What type of landscaping work?",
     updates
   )
 }
 
 function masonrySubtype(updates = {}) {
   return sqstep(
-    'masonrySubtype',
-    masonrySubtype$1(),
-    'What type of masonry work?',
+    "masonrySubtype",
+    masonrySubtype$1(updates.scope, true, updates.input),
+    "What masonry job type?",
     updates
   )
 }
 
 function masonryMaterial(updates = {}) {
   return sqstep(
-    'masonryMaterial',
-    masonryMaterial$1(),
-    'What type of masonry material?',
+    "masonryMaterial",
+    masonryMaterial$1(updates.scope, true, updates.input),
+    "What type of masonry material?",
     updates
   )
 }
 
 function masonryWorkType(updates = {}) {
   return sqstep(
-    'masonryWorkType',
-    masonryWorkType$1(),
-    'What type of masonry work?',
+    "masonryWorkType",
+    masonryWorkType$1(updates.scope, true, updates.input),
+    "What type of masonry work?",
     updates
   )
 }
 
 function restorationSubtype(updates = {}) {
   return sqstep(
-    'restorationSubtype',
-    restorationSubtype$1(),
-    'What type of restoration work?',
+    "restorationSubtype",
+    restorationSubtype$1(updates.scope, true, updates.input),
+    "What type of restoration work?",
     updates
   )
 }
@@ -1938,7 +1940,7 @@ function restorationSubtype(updates = {}) {
 // export function movingFromAddress(updates = {}) {
 //   return sqstep(
 //     'movingFromAddress',
-//     inp.movingFromAddress(),
+//     inp.movingFromAddress(updates.scope, true, updates.input),
 //     'Moving from address:',
 //     updates
 //   )
@@ -1947,7 +1949,7 @@ function restorationSubtype(updates = {}) {
 // export function movingToAddress(updates = {}) {
 //   return sqstep(
 //     'movingToAddress',
-//     inp.movingToAddress(),
+//     inp.movingToAddress(updates.scope, true, updates.input),
 //     'Moving to address:',
 //     updates
 //   )
@@ -1956,7 +1958,7 @@ function restorationSubtype(updates = {}) {
 // export function movingHouseholdSize(updates = {}) {
 //   return sqstep(
 //     'movingHouseholdSize',
-//     inp.movingHouseholdSize(),
+//     inp.movingHouseholdSize(updates.scope, true, updates.input),
 //     'Household size:',
 //     updates
 //   )
@@ -1964,245 +1966,245 @@ function restorationSubtype(updates = {}) {
 
 function paintingSubtype(updates = {}) {
   return sqstep(
-    'paintingSubtype',
-    paintingSubtype$1(),
-    'What type of painting work?',
+    "paintingSubtype",
+    paintingSubtype$1(updates.scope, true, updates.input),
+    "What type of painting work?",
     updates
   )
 }
 
 function paintingRooms(updates = {}) {
   return sqstep(
-    'paintingRooms',
-    paintingRooms$1(),
-    'How many rooms need painting?',
+    "paintingRooms",
+    numberOfRooms$1(updates.scope, true, updates.input),
+    "How many rooms need painting?",
     updates
   )
 }
 
 function pestControlSubtype(updates = {}) {
   return sqstep(
-    'pestControlSubtype',
-    pestControlSubtype$1(),
-    'What type of pest control work?',
+    "pestControlSubtype",
+    pestControlSubtype$1(updates.scope, true, updates.input),
+    "What type of pest control work?",
     updates
   )
 }
 
 function poolsWorkType(updates = {}) {
   return sqstep(
-    'poolsWorkType',
-    poolsWorkType$1(),
-    'What type of pool work?',
+    "poolsWorkType",
+    poolsWorkType$1(updates.scope, true, updates.input),
+    "What type of pool work?",
     updates
   )
 }
 
 function poolsSubtype(updates = {}) {
   return sqstep(
-    'poolsSubtype',
-    poolsSubtype$1(),
-    'What type of pool work?',
+    "poolsSubtype",
+    poolsSubtype$1(updates.scope, true, updates.input),
+    "What type of pool work?",
     updates
   )
 }
 
 function plumbingSubtype(updates = {}) {
   return sqstep(
-    'plumbingSubtype',
-    plumbingSubtype$1(),
-    'What type of plumbing work?',
+    "plumbingSubtype",
+    plumbingSubtype$1(updates.scope, true, updates.input),
+    "What plumbing job type?",
     updates
   )
 }
 
 function remodelingSubtype(updates = {}) {
   return sqstep(
-    'remodelingSubtype',
-    remodelingSubtype$1(),
-    'What type of remodeling work?',
+    "remodelingSubtype",
+    remodelingSubtype$1(updates.scope, true, updates.input),
+    "What type of remodeling work?",
     updates
   )
 }
 
 function roofingWorkType(updates = {}) {
   return sqstep(
-    'roofingWorkType',
-    roofingWorkType$1(),
-    'What type of roofing work?',
+    "roofingWorkType",
+    roofingWorkType$1(updates.scope, true, updates.input),
+    "What type of roofing work?",
     updates
   )
 }
 
 function roofingMaterial(updates = {}) {
   return sqstep(
-    'roofingMaterial',
-    roofingMaterial$1(),
-    'What type of roofing material?',
+    "roofingMaterial",
+    roofingMaterial$1(updates.scope, true, updates.input),
+    "What type of roofing material?",
     updates
   )
 }
 
 function sidingMaterial(updates = {}) {
   return sqstep(
-    'sidingMaterial',
-    sidingMaterial$1(),
-    'What type of siding material?',
+    "sidingMaterial",
+    sidingMaterial$1(updates.scope, true, updates.input),
+    "What type of siding material?",
     updates
   )
 }
 
 function tilingSubtype(updates = {}) {
   return sqstep(
-    'tilingSubtype',
-    tilingSubtype$1(),
-    'What type of tiling work?',
+    "tilingSubtype",
+    tilingSubtype$1(updates.scope, true, updates.input),
+    "What type of tiling work?",
     updates
   )
 }
 
 function waterproofingSubtype(updates = {}) {
   return sqstep(
-    'waterproofingSubtype',
-    waterproofingSubtype$1(),
-    'What type of waterproofing work?',
+    "waterproofingSubtype",
+    waterproofingSubtype$1(updates.scope, true, updates.input),
+    "What type of waterproofing work?",
     updates
   )
 }
 
 function windowsWorkType(updates = {}) {
   return sqstep(
-    'windowsWorkType',
-    windowsWorkType$1(),
-    'What type of windows work?',
+    "windowsWorkType",
+    windowsWorkType$1(updates.scope, true, updates.input),
+    "What type of windows work?",
     updates
   )
 }
 
 function windowsSubtype(updates = {}) {
   return sqstep(
-    'windowsSubtype',
-    windowsSubtype$1(),
-    'What type of windows work?',
+    "windowsSubtype",
+    windowsSubtype$1(updates.scope, true, updates.input),
+    "What windows job type?",
     updates
   )
 }
 
 function numberOfWindows(updates = {}) {
   return sqstep(
-    'numberOfWindows',
-    numberOfWindows$1(),
-    'How many windows?',
+    "numberOfWindows",
+    numberOfWindows$1(updates.scope, true, updates.input),
+    "How many windows?",
     updates
   )
 }
 
 const formNavigation = (updates = {}) => ({
-  $el: 'div',
+  $el: "div",
   attrs: {
-    class: 'step-nav'
+    class: "step-nav",
   },
   children: [
     {
-      $formkit: 'button',
-      name: 'back_button',
-      onClick: '$setPreviousStep($prevStepFunc($get(form)))',
-      children: 'Back',
+      $formkit: "button",
+      name: "back_button",
+      onClick: "$setPreviousStep($prevStepFunc($get(form)))",
+      children: "Back",
       style: {
-        if: '$activeStep === $firstStep()',
-        then: 'visibility: hidden;'
-      }
+        if: "$activeStep === $firstStep()",
+        then: "visibility: hidden;",
+      },
     },
     {
-      $formkit: 'button',
-      name: 'next_button',
-      onClick: '$setNextStep($fireStepEvent($get(form)), $preStepFunc($get(form)))',
+      $formkit: "button",
+      name: "next_button",
+      onClick: "$setNextStep($fireStepEvent($get(form)), $preStepFunc($get(form)))",
       children: {
-        if: '$activeStep === $firstStep()',
-        then: 'Start',
-        else: 'Next'
+        if: "$activeStep === $firstStep()",
+        then: "Start",
+        else: "Next",
       },
       outerClass: {
-        if: '$activeStep === $lastStep()',
-        then: 't-hidden',
-        else: ''
+        if: "$activeStep === $lastStep()",
+        then: "t-hidden",
+        else: "",
       },
       style: {
-        if: '$activeStep === $lastStep()',
-        then: 'display: none;'
-      }
+        if: "$activeStep === $lastStep()",
+        then: "display: none;",
+      },
     },
     {
-      $formkit: 'submit',
-      name: 'submit_button',
-      label: updates.submitLabel || 'Submit',
-      if: '$activeStep === $lastStep()',
+      $formkit: "submit",
+      name: "submit_button",
+      label: updates.submitLabel || "Submit",
+      if: "$activeStep === $lastStep()",
       style: {
-        if: '$activeStep !== $lastStep()',
-        then: 'display: none;'
-      }
-    }
-  ]
+        if: "$activeStep !== $lastStep()",
+        then: "display: none;",
+      },
+    },
+  ],
 });
 
 const formDetails = () => ({
-  $el: 'pre',
+  $el: "pre",
   if: '$urlParam("fdbg", "") == 1',
   children: [
     {
-      $el: 'pre',
-      children: '$stringify( $get(form).value )',
+      $el: "pre",
+      children: "$stringify( $get(form).value )",
       attrs: {
-        class: 't-text-xs',
-        style: 'overflow: scroll'
-      }
+        class: "t-text-xs",
+        style: "overflow: scroll",
+      },
     },
     {
-      $el: 'pre',
-      children: ['activeStep: ', '$activeStep'],
+      $el: "pre",
+      children: ["activeStep: ", "$activeStep"],
       attrs: {
-        class: 't-text-xs',
-        style: 'overflow: scroll'
-      }
+        class: "t-text-xs",
+        style: "overflow: scroll",
+      },
     },
     {
-      $el: 'pre',
-      children: ['stepHistory: ', '$stepHistory'],
+      $el: "pre",
+      children: ["stepHistory: ", "$stepHistory"],
       attrs: {
-        class: 't-text-xs',
-        style: 'overflow: scroll'
-      }
+        class: "t-text-xs",
+        style: "overflow: scroll",
+      },
     },
     {
-      $el: 'pre',
-      children: ['stepQueue: ', '$stepQueue'],
+      $el: "pre",
+      children: ["stepQueue: ", "$stepQueue"],
       attrs: {
-        class: 't-text-xs',
-        style: 'overflow: scroll'
-      }
+        class: "t-text-xs",
+        style: "overflow: scroll",
+      },
     },
     {
-      $el: 'pre',
-      children: ['steps: ', '$stepKeys()'],
+      $el: "pre",
+      children: ["steps: ", "$stepKeys()"],
       attrs: {
-        class: 't-text-xs',
-        style: 'overflow: scroll'
-      }
-    }
-  ]
+        class: "t-text-xs",
+        style: "overflow: scroll",
+      },
+    },
+  ],
 });
 
 const formPropDefaults = {
-  type: 'form',
-  id: 'form',
-  config: { validationVisibility: 'submit' },
+  type: "form",
+  id: "form",
+  config: { validationVisibility: "submit" },
   onSubmit: '$submit($submitUrl, $prepData, $handleRedirect, "text/plain; charset=UTF-8")',
-  plugins: '$plugins',
+  plugins: "$plugins",
   actions: false,
-  anchorElement: 'form-anchor',
+  anchorElement: "form-anchor",
   useLocalStorage: true,
   prepop: {
-    fromURL: true
+    fromURL: true,
   },
   errorCodes: {
     403: { message: "An Error Occurred", abort: false },
@@ -2210,13 +2212,11 @@ const formPropDefaults = {
     429: "An Error Occurred",
     504: { message: "An Error Occurred", abort: false },
   },
-  formClass: '!t-max-w-[40rem]'
+  formClass: "!t-max-w-[40rem]",
 };
 
 function filterMapByKey(obj, keyList) {
-  return Object.fromEntries(
-    Object.entries(obj).filter(([key]) => keyList.includes(key))
-  );
+  return Object.fromEntries(Object.entries(obj).filter(([key]) => keyList.includes(key)))
 }
 
 // export function filteredNextStepsMapLegal(keyList) {
@@ -2226,10 +2226,7 @@ function filterMapByKey(obj, keyList) {
 // }
 
 function formProps(updates) {
-  const props = merge(
-    formPropDefaults,
-    updates
-  );
+  const props = merge(formPropDefaults, updates);
   if (props.formId && !props.name) {
     props.name = props.formId;
   }
@@ -2239,13 +2236,10 @@ function formProps(updates) {
 const metaDefaults = {};
 
 function metaProps(updates) {
-  const data = merge(
-    metaDefaults,
-    updates
-  );
+  const data = merge(metaDefaults, updates);
   return {
-    type: 'meta',
-    data
+    type: "meta",
+    data,
   }
 }
 
@@ -2265,236 +2259,289 @@ function defaultMetaPropsHomeImprovement(category = null) {
     defaultFinalHeadline: DEFAULT_FINAL_HEADLINE_HOME_IMPROVEMENT,
     finalHeadlines: finalHeadlines,
     defaultFinalSubHeadline: DEFAULT_FINAL_SUBHEADLINE_HOME_IMPROVEMENT,
-    finalSubHeadlines: finalSubHeadlines
+    finalSubHeadlines: finalSubHeadlines,
   })
 }
 
-function dynamicSchemaNode(field = 'Type_Of_Legal_Problem') {
+function defaultMetaPropsHomeImprovementGeneral(defaultSteps = nextStepsHomeImprovementDefault) {
+  const meta = defaultMetaPropsHomeImprovement();
+  meta.data.dynamicSchema = [
+    zipcode(),
+    timeframe(),
+    ownHome(),
+    address(),
+    homeImprovementWorkType(),
+    additionsSubType(),
+    constructionAreaSize(),
+    applianceType(),
+    cabinetWorkType(),
+    carpentrySubtype(),
+    carpetWorkType(),
+    cleaningSubtype(),
+    countertopMaterial(),
+    deckWorkType(),
+    demolitionSubtype(),
+    doorSubtype(),
+    drivewayWorkType(),
+    drivewayMaterial(),
+    wallSurfaceType(),
+    electricalSubtype(),
+    fenceMaterial(),
+    flooringMaterial(),
+    generalContractorSubtype(),
+    gutterMaterial(),
+    gutterWorkType(),
+    smartHomeSubtype(),
+    homeOrganizationSubtype(),
+    numberOfRooms(),
+    homeTheaterSubtype(),
+    heatingCoolingSubtype(),
+    fuelSource(),
+    insulationSubtype(),
+    landscapingSubtype(),
+    masonrySubtype(),
+    masonryMaterial(),
+    masonryWorkType(),
+    restorationSubtype(),
+    // Moving not finished yet
+    // steps.movingFromAddress(),
+    // steps.movingToAddress(),
+    // steps.movingHouseholdSize(),
+    paintingSubtype({
+      nextStepMap: nextStepsMapPainting(defaultSteps),
+    }),
+    paintingRooms(),
+    pestControlSubtype(),
+    poolsWorkType(),
+    poolsSubtype(),
+    plumbingSubtype(),
+    remodelingSubtype(),
+    roofingWorkType(),
+    roofingMaterial(),
+    sidingMaterial(),
+    tilingSubtype(),
+    waterproofingSubtype(),
+    windowsWorkType(),
+    windowsSubtype(),
+    numberOfWindows(),
+    commentsHeadline({
+      label: null,
+      headline: "Please briefly describe your project:",
+      headlineClass: "!t-text-dark",
+    }),
+    firstAndLastV3({
+      headlineClass: "!t-text-dark",
+    }),
+  ];
+  return meta
+}
+
+function dynamicSchemaNode(field = "Type_Of_Legal_Problem") {
   return {
-    $cmp: 'FormKitSchema',
-    if: '$get(' + field + ').value',
+    $cmp: "FormKitSchema",
+    if: "$get(" + field + ").value",
     props: {
-      schema: '$meta.dynamicSchema',
-      data: '$buildData($meta)'
-    }
+      schema: "$meta.dynamicSchema",
+      data: "$buildData($meta)",
+    },
   }
 }
 
 const formAnchorDefaults = {
-  $el: 'div',
+  $el: "div",
   children: [
     {
-      $el: 'div',
+      $el: "div",
       attrs: {
-        id: 'form-anchor',
-        class: 't-absolute',
-        style: { top: '-30px', left: 0 }
-      }
-    }
+        id: "form-anchor",
+        class: "t-absolute",
+        style: { top: "-30px", left: 0 },
+      },
+    },
   ],
   attrs: {
-    class: 't-relative'
-  }
+    class: "t-relative",
+  },
 };
 
 function formAnchor(updates) {
-  return merge(
-    formAnchorDefaults,
-    updates
-  )
+  return merge(formAnchorDefaults, updates)
 }
 
 const progressBarDefaults = {
-  $el: 'div',
+  $el: "div",
   attrs: {
-    class: 't-mt-7 t-mb-5 t-w-full t-flex t-flex-col t-justify-center t-items-center',
+    class: "t-mt-7 t-mb-5 t-w-full t-flex t-flex-col t-justify-center t-items-center",
     style: {
-      if: '$fns.eq($activeStep, $firstStep()) || $fns.eq($activeStep, $lastStep())',
-      then: 'display: none'
+      if: "$fns.eq($activeStep, $firstStep()) || $fns.eq($activeStep, $lastStep())",
+      then: "display: none",
     },
   },
   children: [
     {
-      $el: 'div',
+      $el: "div",
       attrs: {
-        class: 't-flex t-justify-center'
+        class: "t-flex t-justify-center",
       },
       children: [
         {
-          $el: 'span',
+          $el: "span",
           attrs: {
-            id: 'progress-bar-text',
-            class: 't-text-sm t-mb-1'
+            id: "progress-bar-text",
+            class: "t-text-sm t-mb-1",
           },
-          children: [
-            "0% Complete"
-          ]
+          children: ["0% Complete"],
         },
-      ]
+      ],
     },
     {
-      $el: 'div',
+      $el: "div",
       attrs: {
-        class: 't-bg-gray-100 t-w-9/12 t-rounded'
+        class: "t-bg-gray-100 t-w-9/12 t-rounded",
       },
       children: [
         {
-          $el: 'div',
+          $el: "div",
           attrs: {
-            id: 'progress-bar',
-            class: 't-flex t-flex-col t-justify-center t-text-center t-whitespace-nowrap t-w-[10%] t-h-1.5 t-rounded t-text-white t-bg-[#007bff]',
+            id: "progress-bar",
+            class:
+              "t-flex t-flex-col t-justify-center t-text-center t-whitespace-nowrap t-w-[10%] t-h-1.5 t-rounded t-text-white t-bg-[#007bff]",
             style: {
-              transition: 'width 0.5s ease'
+              transition: "width 0.5s ease",
             },
           },
-        }
-      ]
-    }
-  ]
+        },
+      ],
+    },
+  ],
 };
 
 function progressBar(updates) {
-  return merge(
-    progressBarDefaults,
-    updates
-  )
+  return merge(progressBarDefaults, updates)
 }
 
 function headlineDefaults(updates = {}) {
   return {
-    $el: 'h1',
+    $el: "h1",
     attrs: {
-      class: 't-flex t-justify-center t-text-center !t-text-[2rem] t-font-semibold t-pt-5 t-px-7 md:t-px-3' + ' ' + (updates.headlineClass || '')
-    }
+      class:
+        "t-flex t-justify-center t-text-center !t-text-[2rem] t-font-semibold t-pt-5 t-px-7 md:t-px-3" +
+        " " +
+        (updates.headlineClass || ""),
+    },
   }
 }
 
 function headline(updates = {}) {
-  return merge(
-    headlineDefaults(updates),
-    updates
-  )
+  return merge(headlineDefaults(updates), updates)
 }
 
 function subHeadlineDefaults(updates = {}) {
   return {
-    $el: 'h3',
+    $el: "h3",
     attrs: {
-      class: 't-flex t-justify-center t-text-center !t-text-[1.2rem] t-font-medium t-text-blue-500 t-px-10' + ' ' + (updates.subheadlineClass || '')
-    }
+      class:
+        "t-flex t-justify-center t-text-center !t-text-[1.2rem] t-font-medium t-text-blue-500 t-px-10" +
+        " " +
+        (updates.subheadlineClass || ""),
+    },
   }
 }
 
 function subHeadline(updates = {}) {
-  return merge(
-    subHeadlineDefaults(updates),
-    updates
-  )
+  return merge(subHeadlineDefaults(updates), updates)
 }
 
 const hiddenInputsBase = [
   {
-    $formkit: 'hidden',
+    $formkit: "hidden",
     name: "gclid",
-    value: null
+    value: null,
   },
   {
-    $formkit: 'hidden',
+    $formkit: "hidden",
     name: "campaignid",
-    value: null
+    value: null,
   },
   {
-    $formkit: 'hidden',
+    $formkit: "hidden",
     name: "s",
-    value: null
-  }
+    value: null,
+  },
 ];
 
 const hiddenInputsHomeImprovement = [
   {
-    $formkit: 'hidden',
+    $formkit: "hidden",
     name: "vertical",
-    value: "HomeImprovement"
+    value: "HomeImprovement",
   },
   {
-    $formkit: 'hidden',
+    $formkit: "hidden",
     name: "TCPA_Language",
-    value: "$meta.tcpaLanguage"
+    value: "$meta.tcpaLanguage",
   },
-  ...hiddenInputsBase
+  ...hiddenInputsBase,
 ];
 
-const homeImprovementRedirectMapDefaults = {
-  '*': HomeImprovementRedirectUrl()
-};
-
-
-function homeImprovementRedirectMap(updates) {
-  return merge(
-    homeImprovementRedirectMapDefaults,
-    updates
-  )
-}
-
-
 // ------ Home Improvement
 
-
 const HomeImprovementCommentsPlaceholders = {
-  'Additions': 'Example: "I would like to add a sunroom to my home"',
-  'Appliances': 'Example: "I need to repair a dishwasher"',
-  'Appraisals': 'Example: "I need to get my home appraised"',
-  'Cabinets': 'Example: "I want to install new kitchen cabinets"',
-  'Carpentry': 'Example: "I need someone to build custom shelves"',
-  'Carpets': 'Example: "I want to replace the carpets in my living room"',
-  'Cleaning': 'Example: "I need a professional cleaning service for my home"',
-  'Countertops': 'Example: "I want to install granite countertops in my kitchen"',
-  'Decks and Porches': 'Example: "I want to build a new deck in my backyard"',
-  'Demolition': 'Example: "I need to demolish a wall in my home"',
-  'Doors': 'Example: "I want to replace the front door of my house"',
-  'Driveways': 'Example: "I need to repair my driveway"',
-  'Drywall and Plaster': 'Example: "I need to repair a hole in my drywall"',
-  'Electrical': 'Example: "I need an electrician to install new light fixtures"',
-  'Fencing': 'Example: "I want to install a privacy fence in my backyard"',
-  'Flooring': 'Example: "I want to install hardwood flooring in my living room"',
-  'Foundations': 'Example: "I need to repair the foundation of my house"',
-  'Garage Doors': 'Example: "I want to replace my garage door"',
-  'General Contractors': 'Example: "I need a general contractor for a home renovation"',
-  'Gutters': 'Example: "I need to clean and repair my gutters"',
-  'Handyman': 'Example: "I need a handyman to fix various things around my house"',
-  'Holiday Decorators': 'Example: "I want to hire someone to decorate my home for the holidays"',
-  'Smart Home': 'Example: "I want to install a smart home automation system"',
-  'Home Builders': 'Example: "I want to build a custom home"',
-  'Home Inspection': 'Example: "I need a home inspection before buying a house"',
-  'Home Organization': 'Example: "I need help organizing my closets and storage"',
-  'Home Security': 'Example: "I want to install a home security system"',
-  'Home Staging': 'Example: "I need a home staging service to prepare my house for sale"',
-  'Home Theater': 'Example: "I want to set up a home theater system"',
-  'Home Warranties': 'Example: "I want to purchase a home warranty"',
-  'Hot Tubs': 'Example: "I want to install a hot tub in my backyard"',
-  'Heating and Cooling': 'Example: "I need to repair my air conditioning unit"',
-  'Insulation': 'Example: "I want to improve the insulation in my home"',
-  'Junk Removal': 'Example: "I need a service to remove junk and debris from my property"',
-  'Landscaping': 'Example: "I want to redesign my backyard landscaping"',
-  'Locksmiths': 'Example: "I need a locksmith to change the locks on my doors"',
-  'Masonry and Concrete': 'Example: "I need to repair a cracked concrete driveway"',
-  'Restoration': 'Example: "I need water damage restoration services"',
-  'Moving': 'Example: "I need a moving company to help me relocate"',
-  'Painting': 'Example: "I want to paint the interior walls of my house"',
-  'Pest Control': 'Example: "I need pest control services for my home"',
-  'Pools': 'Example: "I want to install a swimming pool in my backyard"',
-  'Plumbing': 'Example: "I need a plumber to fix a leaky faucet"',
-  'Pressure Washing': 'Example: "I want to pressure wash the exterior of my house"',
-  'Remodeling': 'Example: "I want to remodel my kitchen"',
-  'Roofing': 'Example: "I need to repair a leaky roof"',
-  'Sheds': 'Example: "I want to build a storage shed in my backyard"',
-  'Siding': 'Example: "I want to replace the siding on my house"',
-  'Solar': 'Example: "I want to install solar panels on my roof"',
-  'Tiling': 'Example: "I want to install new tiles in my bathroom"',
-  'Walk-in Tubs': 'Example: "I want to install a walk-in tub in my bathroom"',
-  'Waterproofing': 'Example: "I need to waterproof my basement"',
-  'Window Cleaning': 'Example: "I need a professional window cleaning service"',
-  'Windows': 'Example: "I want to replace 3 windows in my house"',
+  Additions: 'Example: "I would like to add a sunroom to my home"',
+  Appliances: 'Example: "I need to repair a dishwasher"',
+  Appraisals: 'Example: "I need to get my home appraised"',
+  Cabinets: 'Example: "I want to install new kitchen cabinets"',
+  Carpentry: 'Example: "I need someone to build custom shelves"',
+  Carpets: 'Example: "I want to replace the carpets in my living room"',
+  Cleaning: 'Example: "I need a professional cleaning service for my home"',
+  Countertops: 'Example: "I want to install granite countertops in my kitchen"',
+  "Decks and Porches": 'Example: "I want to build a new deck in my backyard"',
+  Demolition: 'Example: "I need to demolish a wall in my home"',
+  Doors: 'Example: "I want to replace the front door of my house"',
+  Driveways: 'Example: "I need to repair my driveway"',
+  "Drywall and Plaster": 'Example: "I need to repair a hole in my drywall"',
+  Electrical: 'Example: "I need an electrician to install new light fixtures"',
+  Fencing: 'Example: "I want to install a privacy fence in my backyard"',
+  Flooring: 'Example: "I want to install hardwood flooring in my living room"',
+  Foundations: 'Example: "I need to repair the foundation of my house"',
+  "Garage Doors": 'Example: "I want to replace my garage door"',
+  "General Contractors": 'Example: "I need a general contractor for a home renovation"',
+  Gutters: 'Example: "I need to clean and repair my gutters"',
+  Handyman: 'Example: "I need a handyman to fix various things around my house"',
+  "Holiday Decorators": 'Example: "I want to hire someone to decorate my home for the holidays"',
+  "Smart Home": 'Example: "I want to install a smart home automation system"',
+  "Home Builders": 'Example: "I want to build a custom home"',
+  "Home Inspection": 'Example: "I need a home inspection before buying a house"',
+  "Home Organization": 'Example: "I need help organizing my closets and storage"',
+  "Home Security": 'Example: "I want to install a home security system"',
+  "Home Staging": 'Example: "I need a home staging service to prepare my house for sale"',
+  "Home Theater": 'Example: "I want to set up a home theater system"',
+  "Home Warranties": 'Example: "I want to purchase a home warranty"',
+  "Hot Tubs": 'Example: "I want to install a hot tub in my backyard"',
+  "Heating and Cooling": 'Example: "I need to repair my air conditioning unit"',
+  Insulation: 'Example: "I want to improve the insulation in my home"',
+  "Junk Removal": 'Example: "I need a service to remove junk and debris from my property"',
+  Landscaping: 'Example: "I want to redesign my backyard landscaping"',
+  Locksmiths: 'Example: "I need a locksmith to change the locks on my doors"',
+  "Masonry and Concrete": 'Example: "I need to repair a cracked concrete driveway"',
+  Restoration: 'Example: "I need water damage restoration services"',
+  Moving: 'Example: "I need a moving company to help me relocate"',
+  Painting: 'Example: "I want to paint the interior walls of my house"',
+  "Pest Control": 'Example: "I need pest control services for my home"',
+  Pools: 'Example: "I want to install a swimming pool in my backyard"',
+  Plumbing: 'Example: "I need a plumber to fix a leaky faucet"',
+  "Pressure Washing": 'Example: "I want to pressure wash the exterior of my house"',
+  Remodeling: 'Example: "I want to remodel my kitchen"',
+  Roofing: 'Example: "I need to repair a leaky roof"',
+  Sheds: 'Example: "I want to build a storage shed in my backyard"',
+  Siding: 'Example: "I want to replace the siding on my house"',
+  Solar: 'Example: "I want to install solar panels on my roof"',
+  Tiling: 'Example: "I want to install new tiles in my bathroom"',
+  "Walk-in Tubs": 'Example: "I want to install a walk-in tub in my bathroom"',
+  Waterproofing: 'Example: "I need to waterproof my basement"',
+  "Window Cleaning": 'Example: "I need a professional window cleaning service"',
+  Windows: 'Example: "I want to replace 3 windows in my house"',
+  "Not Sure or Other": 'Example: "I need general handyman services"',
 };
 
 const HomeImprovementFinalHeadlines = {
@@ -2612,409 +2659,149 @@ const HomeImprovementFinalSubHeadlines = {
 };
 
 const nextStepsHomeImprovementDefault = [
-  'comments',
-  'timeframe',
-  'ownHome',
-  'zipcode',
-  'address',
-  // 'homeImprovementCrossSells',
-  'firstAndLast',
-  'contactInfo',
+  "comments",
+  "timeframe",
+  "ownHome",
+  "zipcode",
+  "address",
+  "homeImprovementCrossSells",
+  "firstAndLast",
+  "contactInfo",
 ];
 
-const nextStepsMapGeneralHomeImprovement = {
-  values: {
-    'Category': {
-      'Additions': [
-        'additionsSubType',
-        'constructionAreaSize',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Appliances': [
-        'homeImprovementWorkType',
-        'applianceType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Appraisals': [
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Cabinets': [
-        'cabinetWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Carpentry': [
-        'carpentrySubtype',
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Carpets': [
-        'carpetWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Cleaning': [
-        'cleaningSubtype',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Countertops': [
-        'countertopMaterial',
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Decks and Porches': [
-        'deckWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Demolition': [
-        'demolitionSubtype',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Doors': [
-        'doorSubtype',
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Driveways': [
-        'drivewayWorkType',
-        'drivewayMaterial',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Drywall and Plaster': [
-        'wallSurfaceType',
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Electrical': [
-        'electricalSubtype',
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Fencing': [
-        'fenceMaterial',
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Flooring': [
-        'flooringMaterial',
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Foundations': [
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Garage Doors': [
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'General Contractors': [
-        'generalContractorSubtype',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Gutters': [
-        'gutterMaterial',
-        'guttersWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Handyman': [
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Holiday Decorators': [
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Smart Home': [
-        'smartHomeSubtype',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Home Builders': [
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Home Inspection': [
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Home Organization': [
-        'homeOrganizationSubtype',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Home Security': [
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Home Staging': [
-        'numberOfRooms',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Home Theater': [
-        'homeTheaterSubtype',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Home Warranties': [
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Hot Tubs': [
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Heating and Cooling': [
-        'heatingCoolingSubtype',
-        'fuelSource',
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Insulation': [
-        'insulationSubtype',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Junk Removal': [
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Landscaping': [
-        'landscapingSubtype',
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Locksmiths': [
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Masonry and Concrete': [
-        'masonrySubtype',
-        'masonryMaterial',
-        'masonryWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Restoration': [
-        'restorationSubtype',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Moving': [
-        'movingFromAddress',
-        'movingToAddress',
-        'movingHouseholdSize',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Painting': [
-        'paintingSubtype',
-        'paintingRooms',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Pest Control': [
-        'pestControlSubtype',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Pools': [
-        'poolsWorkType',
-        'poolsSubtype',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Plumbing': [
-        'plumbingSubtype',
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Pressure Washing': [
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Remodeling': [
-        'remodelingSubtype',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Roofing': [
-        'roofingWorkType',
-        'roofingMaterial',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Sheds': [
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Siding': [
-        'sidingMaterial',
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Solar': [
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Tiling': [
-        'tilingSubtype',
-        'homeImprovementWorkType',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Walk-in Tubs': [
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Waterproofing': [
-        'waterproofingSubtype',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Window Cleaning': [
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Windows': [
-        'windowsWorkType',
-        'windowsSubtype',
-        'numberOfWindows',
-        ...nextStepsHomeImprovementDefault
-      ]
+const nextStepsMapGeneralHomeImprovement = (defaultSteps = nextStepsHomeImprovementDefault) => {
+  return {
+    values: {
+      Category: {
+        Additions: ["additionsSubType", "constructionAreaSize", ...defaultSteps],
+        Appliances: ["applianceType", "homeImprovementWorkType", ...defaultSteps],
+        Appraisals: [...defaultSteps],
+        Cabinets: ["cabinetWorkType", ...defaultSteps],
+        Carpentry: ["carpentrySubtype", "homeImprovementWorkType", ...defaultSteps],
+        Carpets: ["carpetWorkType", ...defaultSteps],
+        Cleaning: ["cleaningSubtype", ...defaultSteps],
+        Countertops: ["countertopMaterial", "homeImprovementWorkType", ...defaultSteps],
+        "Decks and Porches": ["deckWorkType", ...defaultSteps],
+        Demolition: ["demolitionSubtype", ...defaultSteps],
+        Doors: ["doorSubtype", "homeImprovementWorkType", ...defaultSteps],
+        Driveways: ["drivewayWorkType", "drivewayMaterial", ...defaultSteps],
+        "Drywall and Plaster": ["wallSurfaceType", "homeImprovementWorkType", ...defaultSteps],
+        Electrical: ["electricalSubtype", "homeImprovementWorkType", ...defaultSteps],
+        Fencing: ["fenceMaterial", "homeImprovementWorkType", ...defaultSteps],
+        Flooring: ["flooringMaterial", "homeImprovementWorkType", ...defaultSteps],
+        Foundations: ["homeImprovementWorkType", ...defaultSteps],
+        "Garage Doors": ["homeImprovementWorkType", ...defaultSteps],
+        "General Contractors": ["generalContractorSubtype", ...defaultSteps],
+        Gutters: ["gutterMaterial", "gutterWorkType", ...defaultSteps],
+        Handyman: [...defaultSteps],
+        "Holiday Decorators": [...defaultSteps],
+        "Smart Home": ["smartHomeSubtype", ...defaultSteps],
+        "Home Builders": [...defaultSteps],
+        "Home Inspection": [...defaultSteps],
+        "Home Organization": ["homeOrganizationSubtype", ...defaultSteps],
+        "Home Security": [...defaultSteps],
+        "Home Staging": ["numberOfRooms", ...defaultSteps],
+        "Home Theater": ["homeTheaterSubtype", ...defaultSteps],
+        "Home Warranties": [...defaultSteps],
+        "Hot Tubs": ["homeImprovementWorkType", ...defaultSteps],
+        "Heating and Cooling": ["heatingCoolingSubtype", "fuelSource", "homeImprovementWorkType", ...defaultSteps],
+        Insulation: ["insulationSubtype", ...defaultSteps],
+        "Junk Removal": [...defaultSteps],
+        Landscaping: ["landscapingSubtype", "homeImprovementWorkType", ...defaultSteps],
+        Locksmiths: [...defaultSteps],
+        "Masonry and Concrete": ["masonrySubtype", "masonryMaterial", "masonryWorkType", ...defaultSteps],
+        // TODO :: add support for moving
+        // Moving: ["movingFromAddress", "movingToAddress", "movingHouseholdSize", ...defaultSteps],
+        Restoration: ["restorationSubtype", ...defaultSteps],
+        Painting: ["paintingSubtype", "paintingRooms", ...defaultSteps],
+        "Pest Control": ["pestControlSubtype", ...defaultSteps],
+        Pools: ["poolsSubtype", "poolsWorkType", ...defaultSteps],
+        Plumbing: ["plumbingSubtype", "homeImprovementWorkType", ...defaultSteps],
+        "Pressure Washing": [...defaultSteps],
+        Remodeling: ["remodelingSubtype", ...defaultSteps],
+        Roofing: ["roofingWorkType", "roofingMaterial", ...defaultSteps],
+        Sheds: ["homeImprovementWorkType", ...defaultSteps],
+        Siding: ["sidingMaterial", "homeImprovementWorkType", ...defaultSteps],
+        Solar: ["homeImprovementWorkType", ...defaultSteps],
+        Tiling: ["tilingSubtype", "homeImprovementWorkType", ...defaultSteps],
+        "Walk-in Tubs": [...defaultSteps],
+        Waterproofing: ["waterproofingSubtype", ...defaultSteps],
+        "Window Cleaning": [...defaultSteps],
+        Windows: ["windowsSubtype", "windowsWorkType", "numberOfWindows", ...defaultSteps],
+      },
+      "*": defaultSteps,
     },
-    '*': nextStepsHomeImprovementDefault
   }
 };
 
-const nextStepsMapPainting = {
-  values: {
-    'Painting_Subtype': {
-      'Whole Exterior': nextStepsHomeImprovementDefault,
-      'Exterior Touch-up': nextStepsHomeImprovementDefault,
-      'Interior Rooms': [
-        'paintingRooms',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Interior Touch-up': [
-        'paintingRooms',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Ceilings': [
-        'paintingRooms',
-        ...nextStepsHomeImprovementDefault
-      ],
-      'Deck': nextStepsHomeImprovementDefault,
-      'Shed': nextStepsHomeImprovementDefault,
-      'Cabinets': nextStepsHomeImprovementDefault,
-      'Not Sure or Other': nextStepsHomeImprovementDefault,
-    } 
+const nextStepsMapPainting = (defaultSteps = nextStepsHomeImprovementDefault) => {
+  return {
+    values: {
+      Painting_Subtype: {
+        "Whole Exterior": defaultSteps,
+        "Exterior Touch-up": defaultSteps,
+        "Interior Rooms": ["paintingRooms", ...defaultSteps],
+        "Interior Touch-up": ["paintingRooms", ...defaultSteps],
+        Ceilings: ["paintingRooms", ...defaultSteps],
+        Deck: defaultSteps,
+        Shed: defaultSteps,
+        Cabinets: defaultSteps,
+        "Not Sure or Other": defaultSteps,
+      },
+    },
   }
 };
 
-const meta = defaultMetaPropsHomeImprovement();
-
-meta.data.dynamicSchema = [
-  zipcode(),
-  timeframe(),
-  ownHome(),
-  address(),
-  homeImprovementWorkType(),
-  additionsSubType(),
-  constructionAreaSize(),
-  applianceType(),
-  cabinetWorkType(),
-  carpentrySubtype(),
-  carpetWorkType(),
-  cleaningSubtype(),
-  countertopMaterial(),
-  deckWorkType(),
-  demolitionSubtype(),
-  doorSubtype(),
-  drivewayWorkType(),
-  drivewayMaterial(),
-  wallSurfaceType(),
-  electricalSubtype(),
-  fenceMaterial(),
-  flooringMaterial(),
-  generalContractorSubtype(),
-  gutterMaterial(),
-  guttersWorkType(),
-  smartHomeSubtype(),
-  homeOrganizationSubtype(),
-  numberOfRooms(),
-  homeTheaterSubtype(),
-  heatingCoolingSubtype(),
-  fuelSource(),
-  insulationSubtype(),
-  landscapingSubtype(),
-  masonrySubtype(),
-  masonryMaterial(),
-  masonryWorkType(),
-  restorationSubtype(),
-  // Moving not finished yet
-  // steps.movingFromAddress(),
-  // steps.movingToAddress(),
-  // steps.movingHouseholdSize(),
-  paintingSubtype({
-    nextStepMap: nextStepsMapPainting
-  }),
-  paintingRooms(),
-  pestControlSubtype(),
-  poolsWorkType(),
-  poolsSubtype(),
-  plumbingSubtype(),
-  remodelingSubtype(),
-  roofingWorkType(),
-  roofingMaterial(),
-  sidingMaterial(),
-  tilingSubtype(),
-  waterproofingSubtype(),
-  windowsWorkType(),
-  windowsSubtype(),
-  numberOfWindows(),
-  // steps.plumbingCrossSellQuestions(),
-  commentsHeadline({
-    label: null,
-    headline: 'Please briefly describe your project:',
-    headlineClass: '!t-text-dark',
-  }), 
-  // steps.homeImprovementCrossSells({
-  //   headlineClass: '!t-text-dark',
-  //   nextStepMap: forms.nextStepsMapHomeImprovementCrossSells,
-  // }),
-  firstAndLastV3({
-    headlineClass: '!t-text-dark'
-  }),
-];
+// Omits cross sell step
+const nextStepDefaults = ["comments", "timeframe", "ownHome", "zipcode", "address", "firstAndLast", "contactInfo"];
+
+const meta = defaultMetaPropsHomeImprovementGeneral(nextStepDefaults);
 
 const schema = [
   meta,
   formAnchor(),
   {
-    $cmp: 'FormKit',
+    $cmp: "FormKit",
     props: formProps({
-      formId: 'generalHomeImprovement',
-      redirectMap: homeImprovementRedirectMap(),
-      // valueOverrideMap: forms.homeImprovementAllValueOverrideMap,
-      // crossSellOptionMap: forms.homeImprovementCrossSellOptionMap
+      formId: "generalHomeImprovementThankYou",
+      redirectMap: {
+        "*": "/thank-you",
+      },
     }),
     children: [
       progressBar(),
       headline({
         children: '$urlParam("hl", "Get Started Here!")',
-        if: '$activeStep === $firstStep()'
+        if: "$activeStep === $firstStep()",
       }),
       subHeadline({
         children: '$urlParam("shl", "Fast. Reliable. Local. Free")',
-        if: '$activeStep === $firstStep()'
+        if: "$activeStep === $firstStep()",
       }),
       ...hiddenInputsHomeImprovement,
       {
-        $el: 'div',
+        $el: "div",
         attrs: {
-          class: 'form-body'
+          class: "form-body",
         },
         children: [
           homeImprovementCategory({
             nextOnInput: false,
-            nextStepMap: nextStepsMapGeneralHomeImprovement,
-            headlineClass: 't-text-lg',
+            nextStepMap: nextStepsMapGeneralHomeImprovement(nextStepDefaults),
+            headlineClass: "t-text-lg",
             input: {
-              placeholder: 'Select a Category',
-              innerClass: '!t-max-w-[275px] md:!t-max-w-xl'
-            }
+              placeholder: "Select a Category",
+              innerClass: "!t-max-w-[275px] md:!t-max-w-xl",
+            },
           }),
-          dynamicSchemaNode('Category'),
+          dynamicSchemaNode("Category"),
           contactInfo(),
           formNavigation(),
-          formDetails()
-        ]
-      }
-    ]
-  }
+          formDetails(),
+        ],
+      },
+    ],
+  },
 ];
 
-const formKitNode = schema.find(item => item.$cmp === "FormKit");
-
-// HACK: need to update both to mimic formProps behavior
-formKitNode.props.name = 'generalHomeImprovementThankYou';
-formKitNode.props.formId = 'generalHomeImprovementThankYou';
-formKitNode.props.redirectMap = {
-  '*': '/thank-you'
-};
-
 export { schema as default };