Massive improvements to the light theme (as well as base themimg)