Fixed scope
Added theme switcher