Massive update, new colors, less code, etc.