fixes for themes streams and such