mix two style file to gether and some other changes