BUGFIX: Removed two over-optimizations

The grayscale palette was broken by an early return
The wave setups were erroneously disabled