diff --git a/src/components/ModalCustomEquipment/ArmorType/ArmorType.tsx b/src/components/ModalCustomEquipment/ArmorType/ArmorType.tsx
new file mode 100644
index 00000000..9670a120
--- /dev/null
+++ b/src/components/ModalCustomEquipment/ArmorType/ArmorType.tsx
@@ -0,0 +1,25 @@
+import { Form, Switch } from "antd";
+import React from "react";
+
+interface ArmorTypeProps {}
+
+const ArmorType: React.FC<
+  ArmorTypeProps & React.ComponentPropsWithRef<"div">
+> = ({ className }) => {
+  return (
+    <Form.Item
+      label="Armor Type"
+      name="type"
+      className={className}
+      rules={[{ required: true }]}
+    >
+      <Switch
+        checkedChildren="Light Armor"
+        unCheckedChildren="Heavy Armor"
+        defaultChecked
+      />
+    </Form.Item>
+  );
+};
+
+export default ArmorType;
diff --git a/src/components/ModalCustomEquipment/ModalCustomEquipment.tsx b/src/components/ModalCustomEquipment/ModalCustomEquipment.tsx
index 2414a220..19d274c8 100644
--- a/src/components/ModalCustomEquipment/ModalCustomEquipment.tsx
+++ b/src/components/ModalCustomEquipment/ModalCustomEquipment.tsx
@@ -20,6 +20,7 @@ import {
   EquipmentItem,
 } from "@/data/definitions";
 import SubCategory from "./SubCategory/SubCategory";
+import ArmorType from "./ArmorType/ArmorType";
 
 interface ModalCustomEquipmentProps {
   character: CharData;
@@ -33,7 +34,7 @@ type CategoryFieldMappings = {
 
 const categoryFieldMapping: CategoryFieldMappings = {
   [EquipmentCategories.AMMUNITION]: ["Damage"],
-  [EquipmentCategories.ARMOR]: ["ArmorClass"],
+  [EquipmentCategories.ARMOR]: ["ArmorClass", "ArmorType"],
   [EquipmentCategories.AXES]: ["Size", "Damage", "AttackType", "Range"],
   [EquipmentCategories.BARDING]: ["AnimalWeight", "ArmorClass"],
   [EquipmentCategories.BOWS]: ["Size", "Ammo", "AttackType", "Range"],
@@ -152,6 +153,8 @@ const ModalCustomEquipment: React.FC<
           return <Damage key={index} />;
         case "ArmorClass":
           return <ArmorClass key={index} />;
+        case "ArmorType":
+          return <ArmorType key={index} />;
         case "AttackType":
           return <AttackType key={index} disabled={attackTypeDisabled} />;
         case "Range":
diff --git a/src/support/statSupport.ts b/src/support/statSupport.ts
index 9e8ddfb3..65cc700c 100644
--- a/src/support/statSupport.ts
+++ b/src/support/statSupport.ts
@@ -97,7 +97,12 @@ export const getMovement = (characterData: CharData) => {
   };
 
   const currentArmor = characterData?.wearing?.armor || "";
-  const currentCategory = armorCategoryMap[currentArmor];
+  const currentCategory =
+    armorCategoryMap[currentArmor] ||
+    characterData?.equipment.filter((item) => item.name === currentArmor)[0]
+      ?.type
+      ? "lightArmor"
+      : "heavyArmor";
   const [lightSpeed, heavySpeed] =
     armorSpeedMap[currentCategory || "lightArmor"];
   const weight = getCharacterWeight(characterData);