Rearange skills; Color touchup