added skittles_berry and xoria256 colors
merge branch master