refactoring themeDiscs