Fixed theme issues - Webspark 115, 131, 78, 157