update theme and fix js