diff --git a/app/account/(orderId)/orders/[id]/page.tsx b/app/account/(orderId)/orders/[id]/page.tsx
index 59241fcae..1d960c65b 100644
--- a/app/account/(orderId)/orders/[id]/page.tsx
+++ b/app/account/(orderId)/orders/[id]/page.tsx
@@ -15,7 +15,6 @@ import Image from 'next/image';
 import Link from 'next/link';
 import ActivateWarranty from 'components/orders/activate-warranty';
 import OrderStatuses from 'components/orders/order-statuses';
-import Divider from 'components/divider';
 import { CoreReturn } from 'components/orders/core-return';
 
 function Unfulfilled({ order }: { order: Order }) {
@@ -178,7 +177,7 @@ function OrderDetails({ order }: { order: Order }) {
           </div>
           <div className="flex flex-col gap-2">
             <Label>Shipping Method</Label>
-            <Text>{order.shippingMethod!.name}</Text>
+            <Text>{order.shippingMethod ? order.shippingMethod.name : 'N/A'}</Text>
           </div>
         </div>
         <div className="flex flex-1 flex-col gap-4">
diff --git a/components/engine-sizes/index.tsx b/components/engine-sizes/index.tsx
index ba833c1b9..e66b3e541 100644
--- a/components/engine-sizes/index.tsx
+++ b/components/engine-sizes/index.tsx
@@ -38,7 +38,7 @@ const EngineSizes = async ({ collection }: { collection: Collection }) => {
 
   return (
     <div>
-      <h3 className="mb-3 text-3xl font-semibold text-black-700 lg:text-4xl">
+      <h3 className="mb-3 text-3xl font-semibold text-content-strong lg:text-4xl">
         Browse Engines By Engine Sizes
       </h3>
       <div className="h-auto max-h-[700px] w-full overflow-auto rounded px-10 py-6 shadow">
diff --git a/components/home-page/manufacturers.tsx b/components/home-page/manufacturers.tsx
index 23b93f4ab..b42ce5b79 100644
--- a/components/home-page/manufacturers.tsx
+++ b/components/home-page/manufacturers.tsx
@@ -17,7 +17,7 @@ const Manufacturers = async ({
 
   return (
     <div>
-      <h3 className="mb-3 text-3xl font-semibold text-black-700 lg:text-4xl">{`Browse ${title[variant]} By Manufacturer`}</h3>
+      <h3 className="mb-3 text-3xl font-semibold text-content-strong lg:text-4xl">{`Browse ${title[variant]} By Manufacturer`}</h3>
       <ManufacturersGrid manufacturers={manufacturers} variant={variant} />
     </div>
   );
diff --git a/components/orders/actions.tsx b/components/orders/actions.tsx
index a7773bcf1..289649ea0 100644
--- a/components/orders/actions.tsx
+++ b/components/orders/actions.tsx
@@ -165,59 +165,23 @@ export const confirmOrder = async ({ order, content, formData }: ConfirmOrderOpt
   }
 };
 
-export async function returnCore() {
-  // const rawFormData = [
-  //   getMetafieldValue(
-  //     'coreReturnZip',
-  //     {
-  //       key: '',
-  //       value: formData.get('name') as string | null,
-  //       type: 'file_reference'
-  //     },
-  //     order
-  //   ),
-  //   getMetafieldValue(
-  //     'warrantyActivationInstallation',
-  //     {
-  //       key: 'warranty_activation_installation',
-  //       value: installationFileId,
-  //       type: 'file_reference'
-  //     },
-  //     order
-  //   ),
-  //   getMetafieldValue(
-  //     'warrantyActivationSelfInstall',
-  //     {
-  //       key: 'warranty_activation_self_install',
-  //       value: formData.get('warranty_activation_self_install') === 'on' ? 'true' : 'false',
-  //       type: 'boolean'
-  //     },
-  //     order
-  //   ),
-  //   getMetafieldValue(
-  //     'warrantyActivationMileage',
-  //     {
-  //       key: 'warranty_activation_mileage',
-  //       value: formData.get('warranty_activation_mileage') as string | null,
-  //       type: 'number_integer'
-  //     },
-  //     order
-  //   ),
-  //   getMetafieldValue(
-  //     'warrantyActivationVIN',
-  //     {
-  //       key: 'warranty_activation_vin',
-  //       value: formData.get('warranty_activation_vin') as string | null,
-  //       type: 'single_line_text_field'
-  //     },
-  //     order
-  //   )
-  // ];
+export async function returnCore(order: Order, formData: FormData) {
+  const rawFormData = [
+    getMetafieldValue(
+      'coreReturnZip',
+      {
+        key: '',
+        value: formData.get('name') as string | null,
+        type: 'file_reference'
+      },
+      order
+    )
+  ];
   try {
-    // await updateOrderMetafields({
-    //   orderId: order.id,
-    //   metafields: rawFormData
-    // });
+    await updateOrderMetafields({
+      orderId: order.id,
+      metafields: rawFormData
+    });
 
     revalidateTag(TAGS.orderMetafields);
   } catch (error) {
diff --git a/components/orders/core-return-modal.tsx b/components/orders/core-return-modal.tsx
index c65aa1176..81a496b35 100644
--- a/components/orders/core-return-modal.tsx
+++ b/components/orders/core-return-modal.tsx
@@ -3,7 +3,7 @@ import { Order } from 'lib/shopify/types';
 import { Button, Heading, Input } from 'components/ui';
 import StatesCombobox from 'components/states-combobox';
 import { useTransition } from 'react';
-// import { returnCore } from './actions';
+import { returnCore } from './actions';
 
 export function CoreReturnModal({
   isOpen,
@@ -18,8 +18,7 @@ export function CoreReturnModal({
 
   async function submitCoreReturn(formData: FormData) {
     startTransition(async () => {
-      // returnCore(order, formData);
-      console.log(formData);
+      returnCore(order, formData);
     });
   }
 
@@ -27,7 +26,7 @@ export function CoreReturnModal({
     <Dialog open={isOpen} onClose={onClose} className="relative z-50">
       <DialogBackdrop
         transition
-        className="bg-black/30 fixed inset-0 duration-300 ease-out data-[closed]:opacity-0"
+        className="fixed inset-0 bg-black/30 duration-300 ease-out data-[closed]:opacity-0"
       />
       <div className="fixed inset-0 w-screen overflow-y-auto p-4">
         <div className="flex min-h-full items-center justify-center">
diff --git a/components/orders/order-confirmation-modal.tsx b/components/orders/order-confirmation-modal.tsx
index b94d9d48b..8afcf219e 100644
--- a/components/orders/order-confirmation-modal.tsx
+++ b/components/orders/order-confirmation-modal.tsx
@@ -121,11 +121,11 @@ function OrderConfirmationDetails({
           </div>
           <div className="flex items-center justify-between">
             <Text>Shipping</Text>
-            {order.shippingMethod.price.amount !== '0.0' ? (
+            {order.shippingMethod && order.shippingMethod.price.amount !== '0.0' ? (
               <Price
                 className="text-sm font-semibold"
-                amount={order.shippingMethod!.price.amount}
-                currencyCode={order.shippingMethod!.price.currencyCode}
+                amount={order.shippingMethod.price.amount}
+                currencyCode={order.shippingMethod.price.currencyCode}
               />
             ) : (
               <Text className="font-semibold">Free</Text>
@@ -228,7 +228,7 @@ export default function OrderConfirmationModal({
     <Dialog open={isOpen} onClose={onClose} className="relative z-50">
       <DialogBackdrop
         transition
-        className="bg-black/30 fixed inset-0 duration-300 ease-out data-[closed]:opacity-0"
+        className="fixed inset-0 bg-black/30 duration-300 ease-out data-[closed]:opacity-0"
       />
       <div className="fixed inset-0 w-screen overflow-y-auto p-4">
         <div className="flex min-h-full items-center justify-center">
diff --git a/components/orders/order-confirmation-pdf.tsx b/components/orders/order-confirmation-pdf.tsx
index bc834a259..901cd31e4 100644
--- a/components/orders/order-confirmation-pdf.tsx
+++ b/components/orders/order-confirmation-pdf.tsx
@@ -216,8 +216,10 @@ export default function OrderConfirmationPdf({
                 <Text style={styles.span}>Shipping</Text>
                 <PDFPrice
                   style={styles.span}
-                  amount={order.shippingMethod!.price.amount}
-                  currencyCode={order.shippingMethod!.price.currencyCode}
+                  amount={(order.shippingMethod && order.shippingMethod.price.amount) || '0.0'}
+                  currencyCode={
+                    (order.shippingMethod && order.shippingMethod.price.currencyCode) || 'USD'
+                  }
                 />
               </View>
               <View
diff --git a/components/orders/order-summary.tsx b/components/orders/order-summary.tsx
index 3a4f51481..a9ac8bc19 100644
--- a/components/orders/order-summary.tsx
+++ b/components/orders/order-summary.tsx
@@ -60,11 +60,11 @@ export default function OrderSummary({ order }: { order: Order }) {
           </div>
           <div className="flex items-center justify-between">
             <Text>Shipping</Text>
-            {order.shippingMethod?.price.amount !== '0.0' ? (
+            {order.shippingMethod && order.shippingMethod.price.amount !== '0.0' ? (
               <Price
                 className="text-sm font-semibold"
-                amount={order.shippingMethod!.price.amount}
-                currencyCode={order.shippingMethod!.price.currencyCode}
+                amount={order.shippingMethod.price.amount}
+                currencyCode={order.shippingMethod.price.currencyCode}
               />
             ) : (
               <Text className="font-semibold">Free</Text>
diff --git a/components/page/mini-icon-block.tsx b/components/page/mini-icon-block.tsx
index 6e1cdfaab..878b90ff1 100644
--- a/components/page/mini-icon-block.tsx
+++ b/components/page/mini-icon-block.tsx
@@ -23,12 +23,14 @@ const MiniIconBlock = async ({ block }: { block: Metaobject }) => {
           {content.title && content.content && (
             <div>
               {content.title && (
-                <div className="text-sm font-medium text-black-700">{content.title}</div>
+                <div className="text-sm font-medium text-content-strong">{content.title}</div>
+              )}
+              {content.content && (
+                <p className="mt-2 text-sm text-content-strong">{content.content}</p>
               )}
-              {content.content && <p className="mt-2 text-sm text-black-700">{content.content}</p>}
             </div>
           )}
-          {content.title && <div className="text-sm text-black-700">{content.title}</div>}
+          {content.title && <div className="text-sm text-content-strong">{content.title}</div>}
         </div>
       ))}
     </div>
diff --git a/components/page/rich-text-display.tsx b/components/page/rich-text-display.tsx
index 4ec53cdcc..3b79b197a 100644
--- a/components/page/rich-text-display.tsx
+++ b/components/page/rich-text-display.tsx
@@ -82,7 +82,7 @@ const RichTextBlock = ({ block, className }: { block: Content; className?: strin
   }
 
   return (
-    <p className="text-black-700">
+    <p className="text-content-strong">
       {block.children.map((child, index) => (
         <RichTextBlock key={index} block={child} />
       ))}
diff --git a/components/page/text-block.tsx b/components/page/text-block.tsx
index 4d511214b..b66508ff8 100644
--- a/components/page/text-block.tsx
+++ b/components/page/text-block.tsx
@@ -8,7 +8,7 @@ const TextBlock = ({ block }: { block: Metaobject }) => {
     <div className="flex flex-col gap-8">
       <div className="flex flex-col gap-5 px-4 md:px-0">
         {block.title && (
-          <h3 className="text-xl font-bold leading-6 text-black-700">{block.title}</h3>
+          <h3 className="text-xl font-bold leading-6 text-content-strong">{block.title}</h3>
         )}
 
         <RichTextDisplay contentBlocks={content.children} />
diff --git a/components/plp/default-content.tsx b/components/plp/default-content.tsx
index da1032295..e1da6933a 100644
--- a/components/plp/default-content.tsx
+++ b/components/plp/default-content.tsx
@@ -17,7 +17,7 @@ const DefaultContent = async () => {
   return (
     <div>
       <Tag text="Learn More" />
-      <h3 className="mb-5 mt-3 text-3xl font-semibold text-black-700 lg:text-4xl">{title}</h3>
+      <h3 className="mb-5 mt-3 text-3xl font-semibold text-content-strong lg:text-4xl">{title}</h3>
       <Suspense fallback={<TabsPlaceholder />}>
         <Tabs fields={fields} />
       </Suspense>
diff --git a/components/plp/dynamic-content.tsx b/components/plp/dynamic-content.tsx
index 92cf80b66..60b7088f7 100644
--- a/components/plp/dynamic-content.tsx
+++ b/components/plp/dynamic-content.tsx
@@ -9,7 +9,7 @@ const DynamicContent = ({ content }: { content: Metaobject }) => {
   return (
     <div>
       <Tag text="Learn More" />
-      <h3 className="mb-5 mt-3 text-3xl font-semibold text-black-700 lg:text-4xl">
+      <h3 className="mb-5 mt-3 text-3xl font-semibold text-content-strong lg:text-4xl">
         {content.title}
       </h3>
       <Suspense fallback={<TabsPlaceholder />}>
diff --git a/components/plp/tabs.tsx b/components/plp/tabs.tsx
index 59585f715..f641a94a5 100644
--- a/components/plp/tabs.tsx
+++ b/components/plp/tabs.tsx
@@ -13,7 +13,7 @@ const Tabs = ({ fields }: { fields: { [key: string]: string } }) => {
           {keys.map((key) => (
             <Tab
               key={key}
-              className="flex items-center justify-between rounded-sm bg-gray-200/60 p-3 text-left text-sm font-medium text-black-700 focus:outline-none focus:ring-0 data-[selected]:bg-primary data-[selected]:text-white"
+              className="flex items-center justify-between rounded-sm bg-gray-200/60 p-3 text-left text-sm font-medium text-content-strong focus:outline-none focus:ring-0 data-[selected]:bg-primary data-[selected]:text-white"
             >
               {startCase(key)}
               <ChevronRightIcon className="size-4" />
diff --git a/components/transmission-codes/index.tsx b/components/transmission-codes/index.tsx
index 9f0014d7f..74ec4deee 100644
--- a/components/transmission-codes/index.tsx
+++ b/components/transmission-codes/index.tsx
@@ -40,7 +40,7 @@ const TransmissionCode = async ({ collection }: { collection: Collection }) => {
 
   return (
     <div>
-      <h3 className="mb-3 text-3xl font-semibold text-black-700 lg:text-4xl">
+      <h3 className="mb-3 text-3xl font-semibold text-content-strong lg:text-4xl">
         Browse By Transmission Code
       </h3>
       <div className="h-auto max-h-[700px] w-full overflow-auto rounded px-10 py-6 shadow">
diff --git a/components/ui/heading.tsx b/components/ui/heading.tsx
index a3fbde268..aebc21cda 100644
--- a/components/ui/heading.tsx
+++ b/components/ui/heading.tsx
@@ -26,6 +26,6 @@ export interface HeadingProps extends VariantProps<typeof heading> {
 }
 
 export default function Heading({ children, className, size, as }: HeadingProps) {
-  const Component = as || 'h2';
+  const Component = as || 'span';
   return <Component className={heading({ size, className })}>{children}</Component>;
 }
diff --git a/lib/shopify/index.ts b/lib/shopify/index.ts
index 000146dd7..c3f049e8f 100644
--- a/lib/shopify/index.ts
+++ b/lib/shopify/index.ts
@@ -643,10 +643,6 @@ function reshapeOrder(shopifyOrder: ShopifyOrder): Order {
     totalTax: reshapeMoney(shopifyOrder.totalTax),
     totalPrice: reshapeMoney(shopifyOrder.totalPrice),
     createdAt: shopifyOrder.createdAt,
-    shippingMethod: {
-      name: shopifyOrder.shippingLine?.title,
-      price: reshapeMoney(shopifyOrder.shippingLine.originalPrice)!
-    },
     warrantyActivationDeadline: shopifyOrder.warrantyActivationDeadline,
     warrantyStatus: shopifyOrder.warrantyStatus,
     warrantyActivationInstallation: shopifyOrder.warrantyActivationInstallation,
@@ -667,6 +663,13 @@ function reshapeOrder(shopifyOrder: ShopifyOrder): Order {
     coreReturnDescription: shopifyOrder.coreReturnDescription
   };
 
+  if (shopifyOrder.shippingLine) {
+    order.shippingMethod = {
+      name: shopifyOrder.shippingLine.title,
+      price: reshapeMoney(shopifyOrder.shippingLine.originalPrice)
+    };
+  }
+
   if (shopifyOrder.customer) {
     order.customer = reshapeCustomer(shopifyOrder.customer);
   }
diff --git a/lib/shopify/types.ts b/lib/shopify/types.ts
index b8b9c7a83..c259cd462 100644
--- a/lib/shopify/types.ts
+++ b/lib/shopify/types.ts
@@ -163,7 +163,7 @@ export type Order = {
   totalShipping: Money;
   totalTax: Money;
   totalPrice: Money;
-  shippingMethod: {
+  shippingMethod?: {
     name: string;
     price: Money;
   };
diff --git a/lib/styles.ts b/lib/styles.ts
index 09ec76ab1..d24035282 100644
--- a/lib/styles.ts
+++ b/lib/styles.ts
@@ -18,9 +18,6 @@ export const carPartPlanetColor = {
     200: '#666C89',
     500: '#2D3A7B',
     600: '#111C55'
-  },
-  black: {
-    700: '#1A1A25'
   }
 };
 
@@ -44,9 +41,6 @@ export const remanTransmissionColor = {
     200: '#666C89',
     500: '#2D3A7B',
     600: '#111C55'
-  },
-  black: {
-    700: '#1A1A25'
   }
 };
 
@@ -70,8 +64,5 @@ export const transmissionLocatorColor = {
     200: '#666C89',
     500: '#2D3A7B',
     600: '#111C55'
-  },
-  black: {
-    700: '#1A1A25'
   }
 };