Fix gamepad change shield/ship color code after refactor. Closes #2