improving import theme