Use theme primary colour (def. black) rather than warning (def. red) Show pot/slider list on own row, under switches