Fixed collision bugs and updated colors