Add legal text theme option
Merge changes