Add new theme; split init into two parts.