Added support for themes. Flipswitch and checkbox.