diff --git a/main.pdf b/main.pdf
new file mode 100644
index 0000000..2265f7a
Binary files /dev/null and b/main.pdf differ
diff --git a/main.tex b/main.tex
new file mode 100644
index 0000000..dc54ba8
--- /dev/null
+++ b/main.tex
@@ -0,0 +1,7 @@
+\documentclass[a4paper]{article}
+
+\input{star-wars-formatting.sty}
+
+\begin{document}
+    \input{talent trees/talent-trees.tex}
+\end{document}
diff --git a/star-wars-talents.sty b/star-wars-talents.sty
index 2939f40..141e5e2 100644
--- a/star-wars-talents.sty
+++ b/star-wars-talents.sty
@@ -1866,5 +1866,41 @@
   },%
   {custom loadout}:{
     \swtalent{Custom Loadout}{May add 2 additional hard points to Signature Vehicle.}{}{}{}
+  },%
+  {headbutt}:{
+    \swtalent{Headbutt}{Perform Headbutt incidental, suffering 2 wounds to knock down and disorient enemy.}{true}{}{}
+  },%
+  {indomitable will}:{
+    \swtalent{Indomitable Will}{Once per encounter as a maneuver, suffer 3 strain to commit \force{} up to Force Rating and reduce all damage suffered by an equal amount, but suffer 1 strain each turn.}{true}{true}{}
+  },%
+  {toughened - improved}:{
+    \swtalent{Improved Toughened}{Once per session, may heal wounds equal to ranks in Toughened.}{true}{}{}
+  },%
+  {power from pain}:{
+    \swtalent{Power from Pain}{Once per session as an incidental, may spend 1 Destiny Point to gain +1 Force Rating for each Critical Injury character is suffering until the end of the encounter. Take 1 conflict at the start of each session.}{true}{true}{}
+  },%
+  {inner peace}:{
+    \swtalent{Inner Peace}{Once per encounter, convert a number of dark side Destiny Points equal to ranks in Inner Peace to light side Destiny Points and reduce Conflict gained this sessios.}{true}{}{true}
+  },%
+  {vaapad control}:{
+    \swtalent{Vaapad Control}{When making a Lightsaber combat check, the character may suffer 1 strain to downgrade the difficulty of the check a number of times equal to the number of light side Destiny Points in the Destiny Pool.}{true}{true}{}
+  },%
+  {embrace your hate}:{
+    \swtalent{Embrace Your Hate}{May spend 1 Destiny Point and then suffer Conflict equal to dark side Destiny Points in pool to add equal damage to melee attack. May use this ability once per encounter per rank. Take 1 conflict per rank at the start of each session.}{true}{true}{true}
+  },%
+  {juyo savagery}:{
+    \swtalent{Juyo Savagery}{The character adds +5 to Critical Injury rolls from Lightsaber attacks for each dark side Destiny Point in the Destiny pool. Take 1 conflict at the start of each session.}{}{true}{true}
+  },%
+  {acklay's scything strike}:{
+    \swtalent{Acklay's Scything Strike}{Brawl attacks gain Pierce equal to Force Rating.}{}{true}{}
+  },%
+  {dodge - improved}:{
+    \swtalent{Improved Dodge}{After using Dodge, can make a Move maneuver as an out-of-turn incidental}{true}{}{}
+  },%
+  {sapith sundering}:{
+    \swtalent{Sapith Sundering}{May add \force{} up to Force Rating to Brawl checks; the attack gains the Sunder quality, and character may spend \forcepoint{} generated on the check as \advantage{} to activate the Sunder Quality.}{}{}{}
+  },%
+  {far strike}:{
+    \swtalent{Far Strike}{As an action, make a Brawl check as a ranged attack, adding \force{} up to Force Rating. Increase the range of the attack by one band for each \forcepoint{} spent, to a maximum of long.}{true}{true}{}
   }
 }
diff --git a/talent trees/ace.tex b/talent trees/careers/ace.tex
similarity index 100%
rename from talent trees/ace.tex
rename to talent trees/careers/ace.tex
diff --git a/talent trees/bounty hunter.tex b/talent trees/careers/bounty hunter.tex
similarity index 100%
rename from talent trees/bounty hunter.tex
rename to talent trees/careers/bounty hunter.tex
diff --git a/talent trees/clone soldier.tex b/talent trees/careers/clone soldier.tex
similarity index 100%
rename from talent trees/clone soldier.tex
rename to talent trees/careers/clone soldier.tex
diff --git a/talent trees/colonist.tex b/talent trees/careers/colonist.tex
similarity index 100%
rename from talent trees/colonist.tex
rename to talent trees/careers/colonist.tex
diff --git a/talent trees/commander.tex b/talent trees/careers/commander.tex
similarity index 100%
rename from talent trees/commander.tex
rename to talent trees/careers/commander.tex
diff --git a/talent trees/consular.tex b/talent trees/careers/consular.tex
similarity index 100%
rename from talent trees/consular.tex
rename to talent trees/careers/consular.tex
diff --git a/talent trees/diplomat.tex b/talent trees/careers/diplomat.tex
similarity index 100%
rename from talent trees/diplomat.tex
rename to talent trees/careers/diplomat.tex
diff --git a/talent trees/engineer.tex b/talent trees/careers/engineer.tex
similarity index 100%
rename from talent trees/engineer.tex
rename to talent trees/careers/engineer.tex
diff --git a/talent trees/explorer.tex b/talent trees/careers/explorer.tex
similarity index 100%
rename from talent trees/explorer.tex
rename to talent trees/careers/explorer.tex
diff --git a/talent trees/guardian.tex b/talent trees/careers/guardian.tex
similarity index 100%
rename from talent trees/guardian.tex
rename to talent trees/careers/guardian.tex
diff --git a/talent trees/hired gun.tex b/talent trees/careers/hired gun.tex
similarity index 100%
rename from talent trees/hired gun.tex
rename to talent trees/careers/hired gun.tex
diff --git a/talent trees/jedi.tex b/talent trees/careers/jedi.tex
similarity index 100%
rename from talent trees/jedi.tex
rename to talent trees/careers/jedi.tex
diff --git a/talent trees/mystic.tex b/talent trees/careers/mystic.tex
similarity index 100%
rename from talent trees/mystic.tex
rename to talent trees/careers/mystic.tex
diff --git a/talent trees/seeker.tex b/talent trees/careers/seeker.tex
similarity index 100%
rename from talent trees/seeker.tex
rename to talent trees/careers/seeker.tex
diff --git a/talent trees/sentinel.tex b/talent trees/careers/sentinel.tex
similarity index 100%
rename from talent trees/sentinel.tex
rename to talent trees/careers/sentinel.tex
diff --git a/talent trees/smuggler.tex b/talent trees/careers/smuggler.tex
similarity index 100%
rename from talent trees/smuggler.tex
rename to talent trees/careers/smuggler.tex
diff --git a/talent trees/soldier.tex b/talent trees/careers/soldier.tex
similarity index 100%
rename from talent trees/soldier.tex
rename to talent trees/careers/soldier.tex
diff --git a/talent trees/spy.tex b/talent trees/careers/spy.tex
similarity index 100%
rename from talent trees/spy.tex
rename to talent trees/careers/spy.tex
diff --git a/talent trees/technician.tex b/talent trees/careers/technician.tex
similarity index 100%
rename from talent trees/technician.tex
rename to talent trees/careers/technician.tex
diff --git a/talent trees/universal.tex b/talent trees/careers/universal.tex
similarity index 100%
rename from talent trees/universal.tex
rename to talent trees/careers/universal.tex
diff --git a/talent trees/warrior.tex b/talent trees/careers/warrior.tex
similarity index 99%
rename from talent trees/warrior.tex
rename to talent trees/careers/warrior.tex
index 4a1dd99..160fae3 100644
--- a/talent trees/warrior.tex	
+++ b/talent trees/careers/warrior.tex	
@@ -53,7 +53,7 @@
   \talent{toughened - improved}
   \talent{heroic fortitude}
   \talent{dedication}
-  \talent{power from paint}
+  \talent{power from pain}
 
   \talentlines{||||/||||/||||/||||}{.../.../.../---}
 \end{talenttree}
diff --git a/talent trees/talent-trees.tex b/talent trees/talent-trees.tex
new file mode 100644
index 0000000..1946fe3
--- /dev/null
+++ b/talent trees/talent-trees.tex	
@@ -0,0 +1,28 @@
+\input{talent trees/careers/ace.tex}
+\input{talent trees/careers/bounty hunter.tex}
+\input{talent trees/careers/clone soldier.tex}
+\input{talent trees/careers/colonist.tex}
+\input{talent trees/careers/commander.tex}
+\input{talent trees/careers/consular.tex}
+\input{talent trees/careers/diplomat.tex}
+\input{talent trees/careers/engineer.tex}
+\input{talent trees/careers/explorer.tex}
+\input{talent trees/careers/guardian.tex}
+\input{talent trees/careers/hired gun.tex}
+\input{talent trees/careers/jedi.tex}
+\input{talent trees/careers/mystic.tex}
+\input{talent trees/careers/seeker.tex}
+\input{talent trees/careers/sentinel.tex}
+\input{talent trees/careers/smuggler.tex}
+\input{talent trees/careers/soldier.tex}
+\input{talent trees/careers/spy.tex}
+\input{talent trees/careers/technician.tex}
+\input{talent trees/careers/warrior.tex}
+\input{talent trees/careers/universal.tex}
+
+\ifthenelse{\equal{\undeffed}{}}{}{
+  \newpage%
+  \tn%
+  {\huge Undefined talents (\arabic{undeffed})}
+  \large\undeffed{}
+}
diff --git a/talent-trees.pdf b/talent-trees.pdf
deleted file mode 100644
index ad6f823..0000000
Binary files a/talent-trees.pdf and /dev/null differ
diff --git a/talent-trees.tex b/talent-trees.tex
deleted file mode 100644
index 9c17a64..0000000
--- a/talent-trees.tex
+++ /dev/null
@@ -1,33 +0,0 @@
-\documentclass[a4paper]{article}
-\input{star-wars-formatting.sty}
-
-\begin{document}
-  % \input{talent trees/ace.tex}
-  % \input{talent trees/bounty hunter.tex}
-  % \input{talent trees/clone soldier.tex}
-  % \input{talent trees/colonist.tex}
-  % \input{talent trees/commander.tex}
-  % \input{talent trees/consular.tex}
-  % \input{talent trees/diplomat.tex}
-  % \input{talent trees/engineer.tex}
-  % \input{talent trees/explorer.tex}
-  % \input{talent trees/guardian.tex}
-  % \input{talent trees/hired gun.tex}
-  % \input{talent trees/jedi.tex}
-  % \input{talent trees/mystic.tex}
-  % \input{talent trees/seeker.tex}
-  % \input{talent trees/sentinel.tex}
-  % \input{talent trees/smuggler.tex}
-  % \input{talent trees/soldier.tex}
-  % \input{talent trees/spy.tex}
-  % \input{talent trees/technician.tex}
-  \input{talent trees/warrior.tex}
-  % \input{talent trees/universal.tex}
-
-  \ifthenelse{\equal{\undeffed}{}}{}{
-    \newpage%
-    \tn%
-    {\huge Undefined talents (\arabic{undeffed})}
-    \large\undeffed{}
-  }
-\end{document}