renamed CDTheme to Theme