Tweak to Skins / Options Types