final modifs to theme