Updated CS features with new theme settings