Added the support of custom theme