Implement updates on orchestral/widget#c37248e

Signed-off-by: crynobone <crynobone@gmail.com>