Final commit

Color sorted + figures