Fixed some refactoring errors, everything color-wise works