More simplification of the checkin themes
Theming for tree views
Merged changes