corrected features and theme