compatible default default theme with new changes