new theme and color fix