Added branch cm-11.0 + the theme template