Reworked the theme toolkit