[UPDATE] To the latest theme infrastructure