Theme work

Added support for OSE toggled theme