Improvements to theme Shelf