Same whitespace as master
Theme path fixes