simplify handling of themes
improve specificity of gradient helper