Everything until here should have been added now. Note that I kept the order the buttons were previously in. Also where AA abilities were posted as options I generally went with spells/abilities available for every player. Of course you can edit the file depending on your own AA setup.
If other classes want their buttons updated, they should post the spells.
