fixed style and theme error