Minor theme fixes