extended theme support, prototype fully working