re-worked theme settings implementation