Clean up color theme code