diff --git a/star-wars-talents.sty b/star-wars-talents.sty
index faf2556..a550e05 100644
--- a/star-wars-talents.sty
+++ b/star-wars-talents.sty
@@ -20,15 +20,24 @@
     {animal empathy}{
       \swtalent{Animal Empathy}{When making checks to handle or tame animals, add \force{} no greater than Force rating to the check. Spend \forcepoint{} to add \success{} or \advantage{} to the check.}{}{true}
     }
+    {armor master}{
+      \swtalent{Armor Master}{When wearing armor, increase total soak value by 1.}{}{}
+    }
     {ataru technique}{
       \swtalent{Ataru Technique}{When making a check using the Lightsaber skill, the character may use Agility instead of Brawn.}{}{true}
     }
     {balance}{
       \swtalent{Balance}{When the character recovers strain at the end of the encounter, he may add \force{} per Force rating. He recov ers additional strain equal to \forcepoint{} generated}{true}{true}
     }
+    {blooded}{
+      \swtalent{Blooded}{Add \boost{} per rank of Blooded to all checks to resist or recover from poisons, venoms, or toxins. Reduce duration of ongoing poisons by 1 round per rank of Blooded to a minimum of 1.}{}{}
+    }
     {body guard}{
       \swtalent{Body Guard}{Once per round, perform the Body Guard maneuver to guard an engaged character. Suffer a number of strain no greater than ranks of Body Guard, then until the beginning of the next turn upgrade the difficulty of combat checks targeting the character by that number.}{true}{}
     }
+    {brace}{
+      \swtalent{Brace}{Perform the Brace maneuver to remove \setback{} per rank of Brace from next Action. This may only remove \setback{} added by environmental circumstances}{true}{}
+    }
     {calming aura}{
       \swtalent{Calming Aura}{When an opponent targets character with a Force power, reduce \forcepoint{} generated by 1.}{}{true}
     }
@@ -65,6 +74,9 @@
     {crippling blow}{
       \swtalent{Crippling Blow}{Increase the difficulty of next combat check by 1. If check deals damage, target suffers 1 strain whenever he moves for the remainder of the encounter.}{true}{}
     }
+    {deadly accuracy}{
+      \swtalent{Deadly Accuracy}{When acquired, choose 1 combat skill. Add damage equal to ranks in that skill to one hit of successful attack made using that skill}{}{}
+    }
     {dedication}{
       \swtalent{Dedication}{Gain +1 to a single characteristic. This cannot bring a characteristic above 6.}{}{}
     }
@@ -82,6 +94,9 @@
       weapon, the weapon gains the Defensive quality with
       a rating equal to ranks in Defensive Training}{}{}
     }
+    {disorient}{
+      \swtalent{Disorient}{After hitting with combat check, may spend \advantage{}\advantage{} to disorient target for number of rounds equal to ranks in Disorient}{}{}
+    }
     {disruptive strike}{
       \swtalent{Disruptive Strike}{Perform Disruptive Strike action; make a Lightsaber (Cunning) combat check, adding \force{} no greater than Force rating. Spend \forcepoint{} to add \failure{} to the next combat check the target makes.}{true}{true}
     }
@@ -89,7 +104,7 @@
       \swtalent{Djem So Deflection}{After using Reflect, may spend 1 Destiny Point to perform Move maneuver as out-of-turn incidental to close distance with or engage opponent.}{true}{true}
     }
     {dodge}{
-      \swtalent{Dodge}{When targeted by combat check, may perform a Dodge incidental to suffer a number of strain no greater than ranks of Dodge, then upgrade the difficulty of the check by that number.}{true}{true}
+      \swtalent{Dodge}{When targeted by combat check, may perform a Dodge incidental to suffer a number of strain no greater than ranks of Dodge, then upgrade the difficulty of the check by that number.}{true}{}
     }
     {draw closer}{
       \swtalent{Draw Closer}{Perform Draw Closer action; make a Lightsaber (Willpower) combat check against one silhouette 1 target within
@@ -171,6 +186,9 @@
     {imbue item}{
       \swtalent{Imbue Item}{Take the Imbue Item maneuver; suffer 1 strain and commit \force{} to grant one weapon, piece of armor, or item an improvement while \force{} remains committed. Suffer 1 strain every round \force{} remains committed.}{true}{true}
     }
+    {improved armor master}{
+      \swtalent{Improved Armor Master}{When wearing armor with a soak value of 2 or higher, increase defense by 1}{}{}
+    }
     {improved body guard}{
       \swtalent{Improved Body Guard}{Once per session, when an ally protected by the Body Guard maneuver suffers a hit, suffer the hit instead.}{true}{}
     }
@@ -192,6 +210,9 @@
     {improved reflect}{
       \swtalent{Improved Reflect}{When reflecting a hit that generated \despair{} or \threat{}\threat{}\threat{}, may hit one target in medium range with the same damage as the initial hit, after original attack resolves.}{}{true}
     }
+    {improved stunning blow}{
+      \swtalent{Improved Stunning Blow}{When dealing strain damage with Melee or Brawl checks. may spend \triumph{} to stagger target for 1 round per \triumph{}.}{true}{}
+    }
     {improved terrify}{
       \swtalent{Improved Terrify}{Reduce the difficulty of Terrify's check to Average (\difficulty\difficulty) and may spend to stagger an affected target.}{}{true}
     }
@@ -222,6 +243,9 @@
     {jump up}{
       \swtalent{Jump Up}{Once per round, may stand from seated or prone as an incidental}{true}{}
     }
+    {jury rigged}{
+      \swtalent{Jury Rigged}{Choose 1 weapon. armor, or other item and give it a permanent improvement while it remains in use.}{}{}
+    }
     {keen eyed}{
       \swtalent{Keen Eyed}{Remove \setback{} per rank of Keen Eyed from Perception and Vigilance checks. Decrease time to search a specific area by half.}{}{}
     }
@@ -240,6 +264,9 @@
     {knowledgeable healing}{
       \swtalent{Knowledgeable Healing}{When healing an ally, spend 1 Destiny Point to heal additional wounds equal to ranks in Knowledge (Xenology).}{}{}
     }
+    {lethal blows}{
+      \swtalent{Lethal Blows}{Add + 10 per rank of Lethal Blows to any Critical Injury results inflicted on opponents}{}{}
+    }
     {makashi finish}{
       \swtalent{Makashi Finish}{Take the Makashi Finish ac tion. Perform a Lightsaber (Presence) combat check against engaged target, adding \force{} no greater than Force rating. Spend \forcepoint{} to add +10 to any resulting Critical Injury rolls.}{true}{true}
     }
@@ -276,6 +303,9 @@
     {natural doctor}{
       \swtalent{Natural Doctor}{Once per session may re-roll any 1 Medicine check.}{true}{}
     }
+    {natural enforcer}{
+      \swtalent{Natural Enforcer}{Once per session may re-roll any 1 Coercion or Streetwise check.}{true}{}
+    }
     {natural hunter}{
       \swtalent{Natural Hunter}{Once per session, may reroll any 1 Perception or Vigilance check.}{true}{}
     }
@@ -318,6 +348,12 @@
     {plausible deniability}{
       \swtalent{Plausible Deniability}{Remove \setback{} per rank of Plausible Deniability from Coercion and Deception checks.}{}{}
     }
+    {point blank}{
+      \swtalent{Point Blank}{Add 1 damage per rank of Point Blank to damage of one hit of successful attack while using Ranged (Heavy) or Ranged (Light) skills at close range or engaged}{}{}
+    }
+    {precise aim}{
+      \swtalent{Precise Aim}{Once per round, may perform Precise Aim maneuver Suffer a number of strain no greater than ranks in Precise Aim. then reduce target's melee and ranged defense by that number}{true}{}
+    }
     {preemptive avoidance}{
       \swtalent{Preemptive Avoidance}{May spend I Destiny Point to disengage from engaged enemy as an out-of-turn incidental.}{true}{true}
     }
@@ -396,6 +432,9 @@
     {smooth talker}{
       \swtalent{Smooth Talker}{When first acquired, choose 1 skill; Charm, Coercion, Deception, or Negotiation. When making checks with that skill, spend \triumph{} to gain additional \success{} equal to ranks in Smooth Talker.}{true}{}
     }
+    {sniper shot}{
+      \swtalent{Sniper Shot}{Before making a non thrown ranged attack, may perform a Sniper Shot maneuver to increase the weapon's range by 1 range band per rank in Sniper Shot. Upgrade the difficulty of the attack by 1 per range band increase}{true}{}
+    }
     {soft spot}{
       \swtalent{Soft Spot}{After making a successful attack, may spend 1 Destiny Point to add damage equal to Cunning to one hit.}{true}{}
     }
@@ -405,6 +444,12 @@
     {soresu technique}{
       \swtalent{Soresu Technique}{When making a check using the Lightsaber skill, the character may use Intellect instead of Brawn.}{}{true}
     }
+    {spare clip}{
+      \swtalent{Spare Clip}{Cannot run out of ammo due to \despair{}. Items with Limited Ammo quality run out of ammo as normal.}{}{}
+    }
+    {stalker}{
+      \swtalent{Stalker}{Add \boost{} per rank of stalker to all Stealth and Coordination checks.}{}{}
+    }
     {steely nerves}{
       \swtalent{Steely nerves}{Spend 1 Destiny Point to ignore effects of Critical Injuries on Willpower or Presence checks until the end of the encounter.}{true}{}
     }
@@ -417,6 +462,9 @@
     {street smarts}{
       \swtalent{Street Smarts}{Remove \setback{} per rank of Street Smarts from Streetwise and Knowledge (Underworld) checks.}{}{}
     }
+    {stunning blow}{
+      \swtalent{Stunning Blow}{When making Melee checks, may inflict damage as strain instead of wounds. This does not ignore soak.}{true}{}
+    }
     {sum djem}{
       \swtalent{Sum Djem}{May spend \triumph{} or \advantage{}\advantage{} with successful Lightsaber check to disarm opponent.}{}{true}
     }
@@ -432,6 +480,9 @@
     {swift}{
       \swtalent{Swift}{Does not suffer usual penalties for moving through difficult terrain.}{}{}
     }
+    {targeted blow}{
+      \swtalent{Targeted Blow}{After making a successful attack, may spend 1 Destiny Point to add damage equal to Agility to one}{true}{}
+    }
     {technical aptitude}{
       \swtalent{Technical Aptitude}{Reduce time needed to complete Computers-relat-ed tasks by 25\% per rank.}{}{}
     }
@@ -441,6 +492,9 @@
     {the force is my ally}{
       \swtalent{The Force is My Ally}{Once per session, may suffer 2 strain to perform Force power action as maneuver.}{true}{true}
     }
+    {tinkerer}{
+      \swtalent{Tinkerer}{May add 1 additional hard point to a number of items equal to ranks in Tinkerer. Each item may only be modified once}{}{}
+    }
     {touch of fate}{
       \swtalent{Touch of Fate}{Once per session, add \boost{}\boost{} to any one check.}{true}{true}
     }
diff --git a/talent trees/bounty hunter.tex b/talent trees/bounty hunter.tex
new file mode 100644
index 0000000..b01c063
--- /dev/null
+++ b/talent trees/bounty hunter.tex	
@@ -0,0 +1,88 @@
+\setcareer{Bounty Hunter}{Athletics, Brawl, Perception, Piloting (Planetary), Piloting (Space), Ranged (Heavy), Streetwise, Vigilance}
+
+\begin{talenttree}{Assassin}{Melee, Ranged (Heavy), Skulduggery, Stealth}{Edge of the Empire p. 59}{}
+  \talent{grit}
+  \talent{lethal blows}
+  \talent{stalker}
+  \talent{dodge}
+
+  \talent{precise aim}
+  \talent{jump up}
+  \talent{quick strike}
+  \talent{quick draw}
+
+  \talent{targeted blow}
+  \talent{stalker}
+  \talent{lethal blows}
+  \talent{anatomy lessons}
+
+  \talent{stalker}
+  \talent{sniper shot}
+  \talent{dodge}
+  \talent{lethal blows}
+
+  \talent{precise aim}
+  \talent{deadly accuracy}
+  \talent{dedication}
+  \talent{master of shadows}
+
+  \talentlines{||||/||||/||||/||||}{---/.-./-../...}
+\end{talenttree}
+
+\begin{talenttree}{Gadgeteer}{Brawl, Coercion, Mechanics, Ranged (Light)}{Edge of the Empire p. 60}{}
+  \talent{brace}
+  \talent{toughened}
+  \talent{intimidating}
+  \talent{defensive stance}
+
+  \talent{spare clip}
+  \talent{jury rigged}
+  \talent{point blank}
+  \talent{disorient}
+
+  \talent{toughened}
+  \talent{armor master}
+  \talent{natural enforcer}
+  \talent{stunning blow}
+
+  \talent{jury rigged}
+  \talent{tinkerer}
+  \talent{deadly accuracy}
+  \talent{improved stunning blow}
+
+  \talent{intimidating}
+  \talent{dedication}
+  \talent{improved armor master}
+  \talent{crippling blow}
+
+  \talentlines{.|.|/.|.|/.|.|/.|.|}{--./--./--./--.}
+\end{talenttree}
+
+\begin{talenttree}{Survivalist}{Brawl, Coercion, Mechanics, Ranged (Light)}{Edge of the Empire p. 61}{}
+  \talent{forager}
+  \talent{stalker}
+  \talent{outdoorsman}
+  \talent{expert tracker}
+
+  \talent{outdoorsman}
+  \talent{swift}
+  \talent{hunter}
+  \talent{soft spot}
+
+  \talent{toughened}
+  \talent{expert tracker}
+  \talent{stalker}
+  \talent{natural outdoorsman}
+
+  \talent{toughened}
+  \talent{hunter}
+  \talent{expert tracker}
+  \talent{blooded}
+
+  \talent{enduring}
+  \talent{dedication}
+  \talent{grit}
+  \talent{heroic fortitude}
+
+  \talentlines{|||./||||/||||/|.||}{---/..-/.../--.}
+\end{talenttree}
diff --git a/talent trees/warrior.tex b/talent trees/warrior.tex
index fb8889b..945b2e4 100644
--- a/talent trees/warrior.tex	
+++ b/talent trees/warrior.tex	
@@ -27,36 +27,7 @@
     \talent{dedication}
     \talent{against all odds}
 
-    \talentline{aa}{ab}
-    \talentline{ba}{bb}
-    \talentline{ca}{cb}
-    \talentline{da}{db}
-
-    \talentline{ab}{bb}
-    \talentline{bb}{cb}
-
-    \talentline{ab}{ac}
-    \talentline{bb}{bc}
-    \talentline{cb}{cc}
-    \talentline{db}{dc}
-
-    \talentline{ac}{bc}
-    \talentline{cc}{dc}
-
-    \talentline{ac}{ad}
-    \talentline{bc}{bd}
-    \talentline{cc}{cd}
-    \talentline{dc}{dd}
-
-    \talentline{ad}{bd}
-
-    \talentline{ad}{ae}
-    \talentline{bd}{be}
-    \talentline{cd}{ce}
-    \talentline{dd}{de}
-
-    \talentline{ae}{be}
-    \talentline{be}{ce}
+    \talentlines{||||/||||/||||/||||}{--./-.-/-../--.}
   \end{talenttree}
 
   \begin{talenttree}{Shii-Cho Knight}{Athletics, Coordination, Lightsaber, Melee}{Force and Destiny p. 100}{1}
@@ -85,36 +56,7 @@
     \talent{dedication}
     \talent{parry}
 
-    \talentline{aa}{ab}
-    \talentline{ba}{bb}
-    \talentline{ca}{cb}
-    \talentline{da}{db}
-
-    \talentline{ab}{bb}
-    \talentline{bb}{cb}
-
-    \talentline{ab}{ac}
-    \talentline{bb}{bc}
-    \talentline{cb}{cc}
-    \talentline{db}{dc}
-
-    \talentline{bc}{cc}
-    \talentline{cc}{dc}
-
-    \talentline{ac}{ad}
-    \talentline{bc}{bd}
-    \talentline{cc}{cd}
-    \talentline{dc}{dd}
-
-    \talentline{ad}{bd}
-    \talentline{cd}{dd}
-
-    \talentline{ad}{ae}
-    \talentline{bd}{be}
-
-    \talentline{ae}{be}
-    \talentline{be}{ce}
-    \talentline{ce}{de}
+    \talentlines{||||/||||/||||/||..}{--./.--/-.-/---}
   \end{talenttree}
 
   \begin{talenttree}{Starfighter Ace}{Astrogation, Gunnery, Mechanics, Piloting (Space)}{Force and Destiny p. 101}{1}
@@ -143,32 +85,5 @@
     \talent{dedication}
     \talent{intuitive evasion}
 
-    \talentline{ba}{bb}
-    \talentline{ca}{cb}
-    \talentline{da}{db}
-
-    \talentline{ab}{bb}
-    \talentline{bb}{cb}
-    \talentline{cb}{db}
-
-    \talentline{bb}{bc}
-    \talentline{cb}{cc}
-    \talentline{db}{dc}
-
-    \talentline{ac}{bc}
-
-    \talentline{bc}{bd}
-    \talentline{dc}{dd}
-
-    \talentline{ad}{bd}
-    \talentline{bd}{cd}
-    \talentline{cd}{dd}
-
-    \talentline{ad}{ae}
-    \talentline{bd}{be}
-    \talentline{cd}{ce}
-    \talentline{dd}{de}
-
-    \talentline{be}{ce}
-    \talentline{ce}{de}
+    \talentlines{.|||/.|||/.|.|/||||}{---/-../---/.--}
   \end{talenttree}
\ No newline at end of file
diff --git a/talent-trees.pdf b/talent-trees.pdf
index 81a9074..1054131 100644
Binary files a/talent-trees.pdf and b/talent-trees.pdf differ
diff --git a/talent-trees.tex b/talent-trees.tex
index 3493783..799a69c 100644
--- a/talent-trees.tex
+++ b/talent-trees.tex
@@ -2,11 +2,12 @@
 \input{star-wars-formatting.sty}
 
 \begin{document}
+  \input{talent trees/bounty hunter.tex}
   % \input{talent trees/consular.tex}
   % \input{talent trees/guardian.tex}
   % \input{talent trees/mystic.tex}
   % \input{talent trees/seeker.tex}
   % \input{talent trees/sentinel.tex}
-  \input{talent trees/warrior.tex}
+  % \input{talent trees/warrior.tex}
   % \input{talent trees/universal.tex}
 \end{document}