More improvements to theme