Refactored servers into inheritance hierarchy for code reuse
merged with Tara's changes to color picker