Change Themes and Fix CS