diff --git a/patches/base/014-header-fixes-and-4-plus-part-1.patch b/patches/base/014-header-fixes-and-4-plus-part-1.patch
index df06ae5..64d199f 100644
--- a/patches/base/014-header-fixes-and-4-plus-part-1.patch
+++ b/patches/base/014-header-fixes-and-4-plus-part-1.patch
@@ -716,465 +716,6 @@
  
  Skill With Attacks
  
-@@ -2537,7 +2537,7 @@
- 
- Weird
- 
--### APPEALING
-+#### APPEALING
- 
- You're attractive to others, but perhaps more important, you are likeable and charismatic. You've got that "special
- something" that draws others to you. You often know just the right thing to say to make someone laugh, put them at ease,
-@@ -2564,7 +2564,7 @@
- 4\. Your charismatic ways helped get one of the PCs out of a difficult spot a long time ago, and they always ask you to
- join them on new adventures.
- 
--### BENEFICENT
-+#### BENEFICENT
- 
- Helping others is your calling. It's why you're here. Others delight in your outgoing and charitable nature, and you
- delight in their happiness. You're at your best when you're aiding people, either by explaining how they can best
-@@ -2597,7 +2597,7 @@
- 
- 4\. The choice was between your tattered life and helping others. You haven't looked back since.
- 
--### BRASH
-+#### BRASH
- 
- You're a self-assertive sort, confident in your abilities, energetic, and perhaps a bit irreverent toward ideas that you
- don't agree with. Some people call you bold and brave, but those you've put in their place might call you puffed up and
-@@ -2624,7 +2624,7 @@
- 4\. You told your friend that nothing could scare you, and nothing you saw would change your mind. They brought you to
- your current point.
- 
--### CALM
-+#### CALM
- 
- You've spent most of your life in sedentary pursuits—books, movies, hobbies, and so on—rather than active ones. You're
- well versed in all manner of academia or other intellectual pursuits, but nothing physical. You're not weak or feeble,
-@@ -2659,7 +2659,7 @@
- 
- 4\. One of the other PCs dragged you into it.
- 
--### CHAOTIC
-+#### CHAOTIC
- 
- Danger doesn't mean much to you, mainly because you don't think much about repercussions. In fact, you enjoy sowing
- surprises, just to see what will happen. The more unexpected the result, the happier you are. Sometimes you are
-@@ -2688,7 +2688,7 @@
- 
- 4\. You have no idea how you joined the PCs. You're just going along with it for now until answers present themselves.
- 
--### CHARMING
-+#### CHARMING
- 
- You're a smooth talker and a charmer. Whether through seemingly supernatural means or just a way with words, you can
- convince others to do as you wish. Most likely, you're physically attractive or at least highly charismatic, and others
-@@ -2727,7 +2727,7 @@
- 
- 4\. There is a reward involved, and you need the money.
- 
--### CLEVER
-+#### CLEVER
- 
- You're quick-witted, thinking well on your feet. You understand people, so you can fool them but are rarely fooled.
- Because you easily see things for what they are, you get the lay of the land swiftly, size up threats and allies, and
-@@ -2762,7 +2762,7 @@
- 
- 4\. You suspect that the other PCs won't succeed without you.
- 
--### CLUMSY
-+#### CLUMSY
- 
- Graceless and awkward, you were told that you'd grow out of it, but you never did. You often drop things, trip over your
- own feet, or knock things (or people) over. Some people get frustrated by this quality, but most find it funny and even
-@@ -2803,7 +2803,7 @@
- 
- 4\. You stumbled into the PCs as they were discussing their mission, and they took a liking to you.
- 
--### CRAVEN
-+#### CRAVEN
- 
- Courage fails you at every turn. You lack the willpower and resolve to stand fast in the face of danger. Fear gnaws at
- your heart, chewing away at your mind, driving you to distraction until you cannot bear it. Most times, you back down
-@@ -2849,7 +2849,7 @@
- 
- 4\. The group answered your cries for help when you were in trouble.
- 
--### CREATIVE
-+#### CREATIVE
- 
- Maybe you have a notebook where you write down ideas so you can develop them later. Perhaps you email yourself ideas
- that strike you out of the blue so you can sort them in an electronic document. Or maybe you just sit down, stare at
-@@ -2887,7 +2887,7 @@
- 4\. A creative life is often one beset with financial hurdles. You joined the PCs because you hoped it would be
- profitable.
- 
--### CRUEL
-+#### CRUEL
- 
- Misfortune and suffering do not move you. When another endures hardship, you find it hard to care, and you may even
- enjoy the pain and difficulty the person experiences if they've done you wrong in the past. Your cruel streak may derive
-@@ -2931,7 +2931,7 @@
- 
- 4\. Joining the PCs gives you an opportunity to escape justice for a crime you committed.
- 
--### DISHONORABLE
-+#### DISHONORABLE
- 
- There is no honor among thieves—or betrayers, backstabbers, liars, or cheats. You are all of these things, and either
- you don't lose any sleep over it, or you deny the truth to others or to yourself. Regardless, you are willing to do
-@@ -2964,7 +2964,7 @@
- 
- 4\. You bullied your way in with intimidation and bluster.
- 
--### DOOMED
-+#### DOOMED
- 
- You are quite certain that your fate is leading you, inextricably, toward a terrible end. This fate might be yours
- alone, or you might be dragging along the people closest to you.
-@@ -2995,7 +2995,7 @@
- 
- 4\. You suspect that the only hope you have of avoiding your fate might lie on this path.
- 
--### EMPATHIC
-+#### EMPATHIC
- 
- Other people are open books to you. You may have a knack for reading a person's tells, those subtle movements that
- convey an individual's mood and disposition. Or you may receive information in a more direct way, feeling a person's
-@@ -3031,7 +3031,7 @@
- 
- 4\. You joined the PCs to escape an unpleasant relationship or negative environment.
- 
--### EXILED
-+#### EXILED
- 
- You have walked a long and lonely road, leaving your home and your life behind. You might have committed a heinous
- crime, something so awful that your people forced you out, and if you dare return, you face death. You might have been
-@@ -3070,7 +3070,7 @@
- 
- 4\. You have grown weary of your isolation. Joining the other PCs gives you a chance to belong.
- 
--### FAST
-+#### FAST
- 
- You're fleet of foot. Because you're quick, you can accomplish tasks more rapidly than others can. You're not just quick
- on your feet, however—you're quick with your hands, and you think and react quickly. You even talk quickly.
-@@ -3098,7 +3098,7 @@
- 
- 4\. This mission ties in with a personal goal of your own.
- 
--### FOOLISH
-+#### FOOLISH
- 
- Not everyone can be brilliant. Oh, you don't think of yourself as stupid, and you're not. It's just that others might
- have a bit more . . . wisdom. Insight. You prefer to barrel along headfirst through life and let other people worry
-@@ -3136,7 +3136,7 @@
- 
- 4\. The other PCs needed some muscle who wouldn't overthink things.
- 
--### GRACEFUL
-+#### GRACEFUL
- 
- You have a perfect sense of balance, moving and speaking with grace and beauty. You're quick, lithe, flexible, and
- dexterous. Your body is perfectly suited to dance, and you use that advantage in combat to dodge blows. You might wear
-@@ -3163,7 +3163,7 @@
- 
- 4\. There is reward involved, and you need the money.
- 
--### GUARDED
-+#### GUARDED
- 
- You conceal your true nature behind a mask and are loath to let anyone see who you really are. Protecting yourself,
- physically and emotionally, is what you care about most, and you prefer to keep everyone else at a safe distance. You
-@@ -3197,7 +3197,7 @@
- 
- 4\. The PCs are the only people who will put up with you.
- 
--### HARDY
-+#### HARDY
- 
- Your body was built to take abuse. Whether you're pounding down stiff drinks while holding up a bar in your favorite
- watering hole or trading blows with a thug in a back alley, you keep going, shrugging off hurts and injuries that might
-@@ -3216,7 +3216,7 @@
- Almost Unstoppable: While you are impaired on the damage track, you function as if you were hale. While you are
- debilitated, you function as if you were impaired. In other words, you don't suffer the effects of being impaired until
- you become debilitated, and you never suffer the effects of being debilitated. You still die if all your stat Pools are
--### 0.
-+0.
- 
- Skill: You are trained in Might defense actions.
- 
-@@ -3235,7 +3235,7 @@
- 
- 4\. You believe the only way the PCs will succeed is if you are along to protect them.
- 
--### HIDEOUS
-+#### HIDEOUS
- 
- You are physically repugnant by almost any human standard. You might have had a serious accident, a harmful mutation, or
- just poor genetic luck, but you are incontrovertibly ugly.
-@@ -3267,7 +3267,7 @@
- 
- 4\. You bullied your way in with intimidation and bluster.
- 
--### HONORABLE
-+#### HONORABLE
- 
- You are trustworthy, fair, and forthright. You try to do what is right, to help others, and to treat them well. Lying
- and cheating are no way to get ahead—these things are for the weak, the lazy, or the despicable. You probably spend a
-@@ -3297,7 +3297,7 @@
- 
- 4\. You asked politely if you could join the other PCs in their mission.
- 
--### IMPULSIVE
-+#### IMPULSIVE
- 
- You have a hard time tamping down your enthusiasm. Why wait when you can just do it (whatever it is) and get it done?
- You deal with problems when they arise rather than plan ahead. Putting out the small fires now prevents them from
-@@ -3336,7 +3336,7 @@
- 
- 4\. You're in trouble for acting recklessly. You join the other PCs because they offer a way out of your problem.
- 
--### INQUISITIVE
-+#### INQUISITIVE
- 
- The world is vast and mysterious, with wonders and secrets to keep you amazed for several lifetimes. You feel the
- tugging on your heart, the call to explore the wreckage of past civilizations, to discover new peoples, new places, and
-@@ -3377,7 +3377,7 @@
- 
- 4\. One of the PCs fascinates you, perhaps due to a special or weird ability they have.
- 
--### INTELLIGENT
-+#### INTELLIGENT
- 
- You're quite smart. Your memory is sharp, and you easily grasp concepts that others might struggle with. This aptitude
- doesn't necessarily mean that you've had years of formal education, but you have learned a great deal in your life,
-@@ -3405,7 +3405,7 @@
- 
- 4\. A colleague requested that you take part in the mission as a favor.
- 
--### INTUITIVE
-+#### INTUITIVE
- 
- You are often tickled by a sense of knowing what someone will say, how they will react, or how events might unfold.
- Maybe you have a mutant sense, maybe you can see just a few moments ahead through time, or maybe you're just good at
-@@ -3432,7 +3432,7 @@
- 
- 4\. You're confident the reason you arrived at this point will soon become clear.
- 
--### JOVIAL
-+#### JOVIAL
- 
- You're cheerful, friendly, and outgoing. You put others at ease with a big smile and a joke, possibly one at your own
- expense, though lightly ribbing your companions who can take it is also one of your favorite pastimes. Sometimes people
-@@ -3461,7 +3461,7 @@
- 
- 4\. It was either go with the PCs or face up to a circumstance that was anything but jovial.
- 
--### KIND
-+#### KIND
- 
- It's always been easy for you to see things from the point of view of other people. That ability has made you
- sympathetic to what they really want or need. From your perspective, you're just applying the old proverb that "it's
-@@ -3497,7 +3497,7 @@
- 4\. Your job, which seemed like it would be personally rewarding, is the opposite. You join the PCs to escape the
- drudgery.
- 
--### LEARNED
-+#### LEARNED
- 
- You have studied, either on your own or with an instructor. You know many things and are an expert on a few topics, such
- as history, biology, geography, mythology, nature, or any other area of study. Learned characters typically carry a few
-@@ -3524,7 +3524,7 @@
- 
- 4\. A colleague requested that you take part in the mission as a favor.
- 
--### LUCKY
-+#### LUCKY
- 
- You rely on chance and timely good luck to get you through many situations. When people say that someone was born under
- a lucky star, they mean you. When you try your hand at something new, no matter how unfamiliar the task is, as often as
-@@ -3554,7 +3554,7 @@
- 4\. Your luck saved you when you avoided a speeding vehicle by a fortuitous fall through an opening in the ground (a
- manhole, if in a modern setting). Beneath the ground, you found something you couldn't ignore.
- 
--### MAD
-+#### MAD
- 
- You have delved too deeply into subjects people were not meant to know. You are knowledgeable in things beyond the scope
- of most, but this knowledge has come at a terrible price. You are likely in questionable physical shape and occasionally
-@@ -3591,7 +3591,7 @@
- 
- 4\. You feel compelled by inexplicable intuition.
- 
--### MECHANICAL
-+#### MECHANICAL
- 
- You have a special talent with machines of all kinds, and you're adept at understanding and, if need be, repairing them.
- Perhaps you're a bit of an inventor, creating new machines from time to time. You get called "techie," "tech," "mech,"
-@@ -3619,7 +3619,7 @@
- 
- 4\. Another PC asked you to join them.
- 
--### MYSTERIOUS
-+#### MYSTERIOUS
- 
- The dark figure lurking silently in the corner? That's you. No one really knows where you came from or what your motives
- are—you play things close to the vest. Your manner perplexes and confounds others, but that doesn't make you a poor
-@@ -3651,7 +3651,7 @@
- 
- 4\. Something—a feeling, a dream—told you where to be and when to join the group.
- 
--### MYSTICAL
-+#### MYSTICAL
- 
- You think of yourself as mystical, attuned with the mysterious and the paranormal. Your true talents lie with the
- supernatural. You likely have experience with ancient lore, and you can sense and wield the supernatural—though whether
-@@ -3684,7 +3684,7 @@
- 
- 4\. Various signs and portents led you here.
- 
--### NAIVE
-+#### NAIVE
- 
- You've lived a sheltered life. Your childhood was safe and secure, so you didn't get a chance to learn much about the
- world—and even less chance to experience it. Whether you were training for something, had your nose in a book, or just
-@@ -3713,7 +3713,7 @@
- 
- 4\. Sounded like fun.
- 
--### PERCEPTIVE
-+#### PERCEPTIVE
- 
- You miss little. You pick out the small details in the world around you and are skilled at making deductions from the
- information you find. Your talents make you an exceptional sleuth, a formidable scientist, or a talented scout.
-@@ -3750,7 +3750,7 @@
- 
- 4\. A third party recruited you to follow the PCs and see what they were up to.
- 
--### RESILIENT
-+#### RESILIENT
- 
- You can take a lot of punishment, both physically and mentally, and still come back for more. It takes a lot to put you
- down. Neither physical nor mental shocks or damage have a lasting effect. You're tough to faze. Unflappable.
-@@ -3784,7 +3784,7 @@
- 
- 4\. You lost a bet—unfairly, you think—and had to take someone's place on this mission.
- 
--### RISK-TAKING
-+#### RISK-TAKING
- 
- It's part of your nature to question what others think can't or shouldn't be done. You're not insane, of course—you
- wouldn't attempt to leap across a mile-wide chasm just because you were dared. There's impossible and then there's the
-@@ -3817,7 +3817,7 @@
- 
- 4\. You bragged that you never saw a risk you didn't like, which is how you reached your current point.
- 
--### RUGGED
-+#### RUGGED
- 
- You're a nature lover accustomed to living rough, pitting your wits against the elements. Most likely, you're a skilled
- hunter, gatherer, or naturalist. Years of living in the wild have left their mark with a worn countenance, wild hair, or
-@@ -3848,7 +3848,7 @@
- 
- 4\. There is reward involved, and you need the money.
- 
--### SHARP-EYED
-+#### SHARP-EYED
- 
- You're perceptive and well aware of your surroundings. You notice the little details and remember them. You can be
- difficult to surprise.
-@@ -3873,7 +3873,7 @@
- 
- 4\. You've been noticing some strange things going on, and this all appears related.
- 
--### SKEPTICAL
-+#### SKEPTICAL
- 
- You possess a questioning attitude regarding claims that are often taken for granted by others. You're not necessarily a
- "doubting Thomas" (a skeptic who refuses to believe anything without direct personal experience), but you've often
-@@ -3902,7 +3902,7 @@
- 
- 4\. You need money to fund your research.
- 
--### STEALTHY
-+#### STEALTHY
- 
- You're sneaky, slippery, and fast. These talents help you hide, move quietly, and pull off tricks that require sleight
- of hand. Most likely, you're wiry and small. However, you're not much of a sprinter—you're more dexterous than fleet of
-@@ -3931,7 +3931,7 @@
- 
- 4\. You overheard the other PCs talking about a topic that interested you, so you decided to approach the group.
- 
--### STRONG
-+#### STRONG
- 
- You're extremely strong and physically powerful, and you use these qualities well, whether through violence or feats of
- prowess. You likely have a brawny build and impressive muscles.
-@@ -3957,7 +3957,7 @@
- 
- 4\. There is reward involved, and you need the money.
- 
--### STRONG-WILLED
-+#### STRONG-WILLED
- 
- You're tough-minded, willful, and independent. No one can talk you into anything or change your mind when you don't want
- it changed. This quality doesn't necessarily make you smart, but it does make you a bastion of willpower and resolve.
-@@ -3985,7 +3985,7 @@
- 
- 4\. There is reward involved, and you need the money.
- 
--### SWIFT
-+#### SWIFT
- 
- You move quickly, able to sprint in short bursts and work with your hands with dexterity. You're great at crossing
- distances quickly but not always smoothly. You are likely slim and muscular.
-@@ -4011,7 +4011,7 @@
- 
- 4\. There is reward involved, and you need the money.
- 
--### TONGUE-TIED
-+#### TONGUE-TIED
- 
- You've never been much of a talker. When forced to interact with others, you never think of the right thing to say—words
- fail you entirely, or they come out all wrong. You often end up saying precisely the wrong thing and insult someone
-@@ -4041,7 +4041,7 @@
- 
- 4\. One of the other PCs recruited you for your talents.
- 
--### TOUGH
-+#### TOUGH
- 
- You're strong and can take a lot of physical punishment. You might have a large frame and a square jaw. Tough characters
- frequently have visible scars.
-@@ -4068,7 +4068,7 @@
- 4\. You stepped in to defend one of the PCs when that character was threatened. While talking to them afterward, you
- heard about the group's task.
- 
--### VICIOUS
-+#### VICIOUS
- 
- You try to hide what's inside, fold it into yourself when everything inside you screams to let go, make them pay, make
- them hurt, and make them bleed. Sometimes you succeed for your friends—smiling like they smile, laughing when they
-@@ -4100,7 +4100,7 @@
- 4\. One of the other PCs asked you to come along, believing that your viciousness could be harnessed for the benefit of
- the mission.
- 
--### VIRTUOUS
-+#### VIRTUOUS
- 
- Doing the right thing is a way of life. You live by a code, and that code is something you attend to every day. Whenever
- you slip, you reproach yourself for your weakness and then get right back on track. Your code probably includes
-@@ -4128,7 +4128,7 @@
- 4\. You put virtue before sense and defended someone's honor in the face of an organization or power far greater than
- you. You joined the PCs because they offered aid and friendship when, out of fear of reprisals, no one else would.
- 
--### WEIRD
-+#### WEIRD
- 
- You aren't like anyone else, and that's fine with you. People don't seem to understand you—they even seem put off by
- you—but who cares? You understand the world better than they do because you're weird, and so is the world you live in.
 @@ -4451,7 +4451,7 @@
  The full description for each focus ability listed in this section is found in the Abilities chapter, which has
  descriptions for type, flavor, and focus abilities in a single vast catalog.