Logic fixes for handling new elements.
Add proper handling of HD skins.