Further cleanup of theme. Mostly menus.