core-4161 new styles and theme