Minor changes. Non intrusive workaround for heroku theme loading