Theme fixes & improvements