Added color palette
Changed the modal window
Merge origin/master