Fixed theme issues on Chrome