improved sample
fixed use of themes/styles