More updates

Trying to fix color swap function