bhl-forms 0.7.4 → 0.8.0

package/dist/forms/generalHomeImprovementThankYou.es.js

@@ -2,10 +2,6 @@ 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)';
@@ -15,8 +11,8 @@ 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 DEFAULT_FINAL_HEADLINE_HOME_IMPROVEMENT = "We Found Contractors!";
+const DEFAULT_FINAL_SUBHEADLINE_HOME_IMPROVEMENT = "Compare quotes and save. Verify 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.';
 
@@ -38,6 +34,30 @@ const radio = (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";
@@ -68,6 +88,14 @@ const select = (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";
@@ -270,7 +298,7 @@ const TCPAConsent = (scope) => ({
     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 !t-leading-[0.9rem]",
   },
 });
 
@@ -329,368 +357,679 @@ const HomeImprovementCategoryOptions = [
   "Waterproofing",
   "Window Cleaning",
   "Windows",
+  "Not Sure or Other",
 ];
 
-const homeImprovementCategory$1 = (updates) =>
-  verticalSelect(
+const homeImprovementCategory$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? updates.label : "Select a Category:";
+  return func(
     merge(
       {
-        name: "Category",
-        id: "Category",
+        label,
+        name: scope ? scope + ":" + "Category" : "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 ownHome$1 = (scope) =>
-  verticalRadio({
-    name: scope ? scope + ":" + "Own_Home" : "Own_Home",
-    // label: 'Do you own the home?',
-    options: ["Yes", "No", "No but authorized"],
-  });
-
-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 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 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 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 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) =>
-  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) =>
-  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) =>
-  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) =>
-  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) =>
-  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) =>
-  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 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 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 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 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 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 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 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 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 guttersWorkType$1 = (scope) =>
-  verticalRadio({
-    name: scope ? scope + ":" + "Gutters_Work_Type" : "Gutters_Work_Type",
-    options: ["Install or Replace", "Repair", "Cleaning", "Not Sure or Other"],
-  });
-
-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 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 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 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 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 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 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 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 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 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 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 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 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 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 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, 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, 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 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 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 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 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 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 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 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, 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, 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, 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, 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, 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, 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, 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, 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 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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
 
@@ -728,165 +1067,280 @@ const restorationSubtype$1 = (scope) =>
 //   ]
 // })
 
-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 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 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 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 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 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 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 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 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 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 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 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 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 numberOfWindows$1 = (scope) =>
-  verticalRadio({
-    name: scope ? scope + ":" + "Number_Of_Windows" : "Number_Of_Windows",
-    // label: 'How many windows?',
-    options: ["1", "2", "3-5", "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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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))))";
@@ -1182,46 +1636,8 @@ function zipcode(updates = {}) {
   return sqstep("zipcode", zipcode$1(updates.scope, true, updates.input), "Please verify your Zip Code", 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('CrossSell:Remodeling', false,
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//       )
-//     ],
-//     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('CrossSell:Roofing', false,
-//         {
-//           label: 'Project Description:',
-//           placeholder: 'Please describe your project in a few words...',
-//           inputClass: '!t-h-16'
-//         },
-//       )
-//     ],
-//     updates
-//   )
-// }
-
 function homeImprovementCategory(updates = {}) {
-  return step("homeImprovementCategory", [homeImprovementCategory$1(updates.scope, false, updates.input)], updates)
+  return step("homeImprovementCategory", [homeImprovementCategory$1(updates.scope, true, updates.input)], updates)
 }
 
 function timeframe(updates = {}) {
@@ -1286,7 +1702,7 @@ function carpentrySubtype(updates = {}) {
   return sqstep(
     "carpentrySubtype",
     carpentrySubtype$1(updates.scope, true, updates.input),
-    "What type of carpentry work?",
+    "What carpentry job type?",
     updates
   )
 }
@@ -1371,7 +1787,7 @@ function electricalSubtype(updates = {}) {
   return sqstep(
     "electricalSubtype",
     electricalSubtype$1(updates.scope, true, updates.input),
-    "What type of electrical work?",
+    "What electrical job type?",
     updates
   )
 }
@@ -1412,10 +1828,10 @@ function gutterMaterial(updates = {}) {
   )
 }
 
-function guttersWorkType(updates = {}) {
+function gutterWorkType(updates = {}) {
   return sqstep(
-    "guttersWorkType",
-    guttersWorkType$1(updates.scope, true, updates.input),
+    "gutterWorkType",
+    gutterWorkType$1(updates.scope, true, updates.input),
     "What type of gutter work?",
     updates
   )
@@ -1456,7 +1872,7 @@ function heatingCoolingSubtype(updates = {}) {
   return sqstep(
     "heatingCoolingSubtype",
     heatingCoolingSubtype$1(updates.scope, true, updates.input),
-    "What type of heating and cooling work?",
+    "What heating or cooling job type?",
     updates
   )
 }
@@ -1487,7 +1903,7 @@ function masonrySubtype(updates = {}) {
   return sqstep(
     "masonrySubtype",
     masonrySubtype$1(updates.scope, true, updates.input),
-    "What type of masonry work?",
+    "What masonry job type?",
     updates
   )
 }
@@ -1560,7 +1976,7 @@ function paintingSubtype(updates = {}) {
 function paintingRooms(updates = {}) {
   return sqstep(
     "paintingRooms",
-    paintingRooms$1(updates.scope, true, updates.input),
+    numberOfRooms$1(updates.scope, true, updates.input),
     "How many rooms need painting?",
     updates
   )
@@ -1597,7 +2013,7 @@ function plumbingSubtype(updates = {}) {
   return sqstep(
     "plumbingSubtype",
     plumbingSubtype$1(updates.scope, true, updates.input),
-    "What type of plumbing work?",
+    "What plumbing job type?",
     updates
   )
 }
@@ -1669,7 +2085,7 @@ function windowsSubtype(updates = {}) {
   return sqstep(
     "windowsSubtype",
     windowsSubtype$1(updates.scope, true, updates.input),
-    "What type of windows work?",
+    "What windows job type?",
     updates
   )
 }
@@ -1686,7 +2102,11 @@ function numberOfWindows(updates = {}) {
 const formNavigation = (updates = {}) => ({
   $el: "div",
   attrs: {
-    class: "step-nav",
+    class: {
+      if: "$activeStep === $firstStep()",
+      then: "step-nav !t-justify-center sm:!t-justify-between",
+      else: "step-nav !t-justify-between",
+    },
   },
   children: [
     {
@@ -1694,9 +2114,17 @@ const formNavigation = (updates = {}) => ({
       name: "back_button",
       onClick: "$setPreviousStep($prevStepFunc($get(form)))",
       children: "Back",
+      outerClass: {
+        if: "$activeStep === $firstStep()",
+        then: "t-hidden sm:t-block",
+        else: "",
+      },
       style: {
         if: "$activeStep === $firstStep()",
-        then: "visibility: hidden;",
+        then: "display: none;",
+      },
+      classes: {
+        input: updates.inputClass || "",
       },
     },
     {
@@ -1705,7 +2133,7 @@ const formNavigation = (updates = {}) => ({
       onClick: "$setNextStep($fireStepEvent($get(form)), $preStepFunc($get(form)))",
       children: {
         if: "$activeStep === $firstStep()",
-        then: "Start",
+        then: updates.startText || "Start",
         else: "Next",
       },
       outerClass: {
@@ -1717,6 +2145,9 @@ const formNavigation = (updates = {}) => ({
         if: "$activeStep === $lastStep()",
         then: "display: none;",
       },
+      classes: {
+        input: updates.inputClass || "",
+      },
     },
     {
       $formkit: "submit",
@@ -1727,6 +2158,9 @@ const formNavigation = (updates = {}) => ({
         if: "$activeStep !== $lastStep()",
         then: "display: none;",
       },
+      classes: {
+        input: (updates.inputClass || "") + " !t-ml-2 sm:!t-ml-auto",
+      },
     },
   ],
 });
@@ -1847,6 +2281,79 @@ function defaultMetaPropsHomeImprovement(category = null) {
   })
 }
 
+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",
@@ -1995,14 +2502,6 @@ const hiddenInputsHomeImprovement = [
   ...hiddenInputsBase,
 ];
 
-const homeImprovementRedirectMapDefaults = {
-  "*": HomeImprovementRedirectUrl(),
-};
-
-function homeImprovementRedirectMap(updates) {
-  return merge(homeImprovementRedirectMapDefaults, updates)
-}
-
 // ------ Home Improvement
 
 const HomeImprovementCommentsPlaceholders = {
@@ -2060,6 +2559,7 @@ const HomeImprovementCommentsPlaceholders = {
   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 = {
@@ -2182,174 +2682,98 @@ const nextStepsHomeImprovementDefault = [
   "ownHome",
   "zipcode",
   "address",
-  // 'homeImprovementCrossSells',
+  "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,
@@ -2357,10 +2781,10 @@ const schema = [
   {
     $cmp: "FormKit",
     props: formProps({
-      formId: "generalHomeImprovement",
-      redirectMap: homeImprovementRedirectMap(),
-      // valueOverrideMap: forms.homeImprovementAllValueOverrideMap,
-      // crossSellOptionMap: forms.homeImprovementCrossSellOptionMap,
+      formId: "generalHomeImprovementThankYou",
+      redirectMap: {
+        "*": "/thank-you",
+      },
     }),
     children: [
       progressBar(),
@@ -2381,7 +2805,7 @@ const schema = [
         children: [
           homeImprovementCategory({
             nextOnInput: false,
-            nextStepMap: nextStepsMapGeneralHomeImprovement,
+            nextStepMap: nextStepsMapGeneralHomeImprovement(nextStepDefaults),
             headlineClass: "t-text-lg",
             input: {
               placeholder: "Select a Category",
@@ -2398,13 +2822,4 @@ const schema = [
   },
 ];
 
-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 };