Fixed oil and fuel opacity

Fixes oil and fuel opacity. Progress on #1843.