Added extensibility and modularity to theming system