working on themes some more.