New theme, wrap opts, inline_theme string and docs
fix conflict