Merged new doc theme from dev branch