Update to ensure skin choice is set by default not just after button click (ie. accepting default values was not always being reflected downstream)