remove custom themes and template
Merge branch 'v2.3-latest'