Allow per widget styling
Merge
Merge branch 'b---h-master'