Most of the theme overhaul