big pivot on theme organization and overriding