Theme Options fixes and a small default fix