Minor theme related fix...