Updated RS widgets for 3.6