updated theme, fixed mixed states