Theme Options enhanced