Further inplementation of Theme object model