fix theme and build error