Stabilized theme references

Themeswitcher was causing issues