diff --git a/lang/en.json b/lang/en.json
index b195c39e..5ff5e1fc 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -197,6 +197,7 @@
     "SW5E.ChatContextHalfDamage": "Apply Half Damage",
     "SW5E.ChatContextHealing": "Apply Healing",
     "SW5E.ChatFlavor": "Chat Message Flavor",
+    "SW5E.ClassCasterType": "Class Caster Type",
     "SW5E.ClassLevels": "Class Levels",
     "SW5E.ClassName": "Class Name",
     "SW5E.ClassSkillsChosen": "Chosen Class Skills",
diff --git a/template.json b/template.json
index 995ee36d..156757c6 100644
--- a/template.json
+++ b/template.json
@@ -544,7 +544,6 @@
     "types": ["archetype", "background", "backpack", "class", "classfeature", "consumable", "deployment", "deploymentfeature", "equipment", "feat", "fightingmastery", "fightingstyle", "lightsaberform", "loot", "power", "species", "starshipfeature", "starshipmod", "tool", "venture", "weapon"],
     "templates": {
       "archetypeDescription": {
-        "className": "",
 	      "description": "",
         "source": ""
       },
@@ -607,12 +606,12 @@
           "chat": "",
           "unidentified": ""
         },
+        "requirements": "",
         "source": ""
       },
 	    "classDescription": {
-		    "className": "",
-	      "description": {
-        "value": ""
+		    "description": {
+          "value": ""
         }
 		  },
       "fightingmasteryDescription": {
@@ -646,16 +645,17 @@
           "chat": "",
           "unidentified": ""
         },
+        "source": "",
 		    "traits": ""
 	    },
-	  "ventureDescription": {
+	    "ventureDescription": {
         "description": {
           "value": ""
         },
-		"prerequisites": [""],
-		"source": {
-		  "value": ""
-		}
+        "prerequisites": [""],
+        "source": {
+          "value": ""
+        }
       },		
       "physicalItem": {
         "quantity": 1,
@@ -726,13 +726,39 @@
           "dt": null,
           "conditions": ""
         }
+      },
+      "starshipEquipment": {
+        "capx": {
+          "value":null
+        },
+        "hpperhd": {
+          "value":null
+        },
+        "regrateco": {
+          "value":null
+        },
+        "cscap": {
+          "value":null
+        },
+        "sscap": {
+          "value":null
+        },
+        "fuelcostsmod": {
+          "value":null
+        },
+        "powerdicerec": {
+          "value":null
+        },
+        "hdclass": {
+          "value":null
+        }
       }
     },
     "htmlFields": ["description.value", "description.chat", "description.unidentified"],
     "archetype": {
       "templates": ["archetypeDescription"],
       "className": "",
-      "description": ""
+      "classCasterType": ""
     },
     "background": {
       "templates": ["backgroundDescription"]
@@ -760,11 +786,27 @@
         "choices": [],
         "value": []
       },
+      "source": "",
       "powercasting": "none"
     },
     "classfeature": {
       "templates": ["itemDescription", "activatedEffect", "action"],
-      "className": ""
+      "recharge": {
+        "charged": false,
+        "value": null
+      }
+    },
+    "deployment": {
+      "templates": ["classDescription"],
+      "flavorText": "",
+      "source": ""
+    },
+    "deploymentfeature": {
+      "templates": ["itemDescription", "activatedEffect", "action"],
+      "recharge": {
+        "charged": false,
+        "value": null
+      }
     },
     "fightingmastery": {
       "templates": ["fightingmasteryDescription"]
@@ -786,7 +828,7 @@
       }
     },
     "equipment": {
-      "templates": ["itemDescription", "physicalItem", "activatedEffect", "action", "mountable"],
+      "templates": ["itemDescription", "physicalItem", "activatedEffect", "action", "mountable", "starshipEquipment"],
       "armor": {
         "type": "light",
         "value": 10,
@@ -850,11 +892,27 @@
     "starshipfeature": {
       "templates": ["itemDescription", "activatedEffect", "action"],
       "size": "med",
-	  "tier": 0
+	    "tier": 0
+    },
+    "starshipmod": {
+      "templates": ["itemDescription", "activatedEffect", "action"],
+      "recharge": {
+        "charged": false,
+        "value": null
+      },
+      "system": {
+        "value": ""
+      },
+      "grade": {
+        "value": ""
+      },
+      "basecost": {
+        "value": ""
+      },
+      "prerequisites": {
+        "value": ""
+      }
     },
-	"starshipmod": {
-	  "templates": ["itemDescription"]
-	},
     "weapon": {
       "templates": ["itemDescription", "physicalItem" ,"activatedEffect", "action", "mountable"],
       "weaponType": "simpleVW",
diff --git a/templates/items/archetype.html b/templates/items/archetype.html
index d194a2c7..1da586bd 100644
--- a/templates/items/archetype.html
+++ b/templates/items/archetype.html
@@ -19,7 +19,7 @@
                    <input type="text" name="data.className" value="{{data.className}}" placeholder="{{ localize 'SW5E.ClassName' }}"/>
                 </li>
                 <li style="width: 275px;">
-                    <input type="text" name="data.classCasterType" value="{{data.classCasterType}}" />
+                    <input type="text" name="data.classCasterType" value="{{data.classCasterType}}" placeholder="{{ localize 'SW5E.ClassCasterType' }}"/>
                 </li>
                 <li style="width: 75px;">
                     <input type="text" name="data.source" value="{{data.source}}" placeholder="{{ localize 'SW5E.Source' }}"/>