Lots of fixes to the theme
pixel pushing