Update theme collection
Add new BaseModel class and update some core file