Cleaned up change-color function as threading macro