fixes to buffer themas