Fix skin/theme behaviour & support same-name skins for different themes.