Fixed some issue in default jaw theme