Add new colors and refactored right click

Add new colors and refactored right click