Split out themes assembly