add theme again
Merge branch 'optimization'