mostly theme stuff
merge