simplify segmented controls and fix js. broke themes
fixing the themes