Further implementation of Theme object model