Overhaul of theme.