Theme base support

Theme base support