prep for new and improved theme system