changed theme variables to more semantic names

also added controls to switch themes (not fully implemented yet)