I decided to rework the skills and skill groups. Sorry I don't know how to make the below a spoiler:
AGILITY: Armed Combat, Athletics, Escape Artist, Gunnery, Heavy Weapons, Locksmith, Palming, Small Arms, Sneaking, Targeting, Unarmed Combat, Exotic Weapon
BODY: Diving, Free Fall STRENGTH: Athletics WILLPOWER: Astral Combat, Survival
REACTION: Pilot Aircraft, Pilot Ground Craft, Pilot Watercraft, Pilot Exotic
CHARISMA: Animal Handling, Con, Impersonation, Intimidation, Leadership, Negotiation
INTUITION: Assensing, Disguise, Language, Tracking, Interest, Street
LOGIC: Aeronautics Mechanic, Arcana, Armorer, Automotive Mechanic, Biotechnology, Chemistry, Computer, Cybertechnology, Demolitions, First Aid, Forgery, Hardware, Industrial Mechanic, Nautical Mechanic, Software, Academic, Professional
MAGIC: Conjuring, Enchanting, Sorcery
RESONANCE: Tasking
ACTING: Con, Disguise, Impersonation
BIOTECH: Biotechnology, Cybertechnology, Medicine
CLOSE COMBAT: Armed Combat, Targeting, Unarmed Combat
COMBAT ENGINEER: Armorer, Demolitions, Industrial Mechanic
ELECTRONICS: Computer, Hardware, Software
ENGINEERING: Aeronautics Mechanic, Automotive Mechanic, Nautical Mechanic
EXTREME SPORTS: Athletics, Diving, Free Fall
FIREARMS: Gunnery, Heavy Weapons, Small Arms
INFLUENCE: Intimidation, Leadership, Negotiation
METAPHYSICS: Arcana, Assensing, Astral Combat
OUTDOORS: Animal Handling, Survival, Tracking
PILOT: Pilot Aircraft, Pilot Ground Craft, Pilot Watercraft
THIEVERY: Escape Artist, Locksmith, Palming
Artisan, Performance, and the surgery aspect of Medicine are Knowledges
Archery and Throwing are now Targeting
Automatics is part of Heavy Weapons
First Aid is part of Medicine
Long Arms and Pistols are now Small Arms
Gymnastics, Running, Swimming are now Athletics
Instruction is part of Leadership
Navigation is part of Survival
Cybercombat is part of Computer
Electronic Warfare and Hacking are part of Software
Pilot Aerospace is part of Pilot Aircraft
Pilot Walker is part of Pilot Ground Craft
Etiquette is now an Attribute Only test, Charisma + Intuition
Perception is now an Attribute Only test, Intuition + Willpower (+ Logic to Observe In Detail)
Defaulting Attribute -3, appropriate Skill -2, appropriate Skill Group -1