Merging in dainty-theme change I requested. (Thanks Sorella)