Added colorchoice and preview
Merge
Merge branch 'master' of https://github.com/dajamagit/alpaca