added themes to buttons and removed toggleControls