Added scoping to theme control