Implemented changes in Theme system