Added more control capabilities and Theme options.