Various refactorings, cleaning up dependencies, etc.  First work on configurable colors.