Cleanup Code
Refactored menu definition names
Added color-picker