Change stuff up
Fix up colors