add theme and fix js