diff --git a/strange_eons_to_arkhamdb.js b/strange_eons_to_arkhamdb.js
index 5a9efbc..8b53fb4 100644
--- a/strange_eons_to_arkhamdb.js
+++ b/strange_eons_to_arkhamdb.js
@@ -43,9 +43,9 @@ const tag_replacements = {
   "<rog>": "[rogue]",
   "<mys>": "[mystic]",
   "<sur>": "[survivor]",
-  "<wil>": "[will]",
-  "<int>": "[lore]",
-  "<com>": "[strength]",
+  "<wil>": "[willpower]",
+  "<int>": "[intellect]",
+  "<com>": "[combat]",
   "<agi>": "[agility]",
   "<wild>": "[wild]",
   "<sku>": "[skull]",
@@ -96,7 +96,6 @@ const card_types = {
 };
 
 var card_data = {
-  agility: skills["Agility"],
   code: String(code),
   // TODO: handle None/X
   cost: parseInt(Component.settings.get('ResourceCost')) || null,
@@ -106,22 +105,23 @@ var card_data = {
   health: parseInt(Component.settings.get('Stamina')) || null,
   illustrator: String(Component.settings.get('Artist')),
   is_unique: Component.settings.getBoolean('Unique'),
-  lore: skills["Intellect"],
   name: substitute_tags(String(card_name)),
   pack_code: pack_code,
   position: parseInt(Component.settings.get('CollectionNumber')) || null,
   quantity: 2, // TODO
   //restrictions: null, // TODO
   sanity: parseInt(Component.settings.get('Sanity')) || null,
+  skill_agility: skills["Agility"],
+  skill_combat: skills["Combat"],
+  skill_intellect: skills["Intellect"],
+  skill_wild: skills["Wild"],
+  skill_willpower: skills["Willpower"],
   slot: String(slot),
-  strength: skills["Combat"],
   // TODO: should also handle "Victory" field
   text: substitute_tags(String(
     Component.settings.get('Keywords') + '\n' + Component.settings.get('Rules'))),
   traits: substitute_tags(String(Component.settings.get('Traits'))),
   type_code: card_types[Component.getFrontTemplateKey()],
-  wild: skills["Wild"],
-  will: skills["Willpower"],
   xp: parseInt(Component.settings.get('Level')) || null,
 };