Added color class, renamed some variables
Handle update command
Merge branch 'feature/update' into develop