Removed old code
Added color options