Added support to secondary themes.