White theme mostly done