Re-ordered button styles to fix inheritance problems.
Bumped version.