Final refactoring; removes color pollution; adds from_base