Rearrange more
Merge branch 'master' of https://github.com/gfb107/yamj-iSkin2.git