WIP: trying to get new theme to work