Switch Themes

Uses a slighly edited layout to add more of the icons back.