Minor changes to themes, formatting