possible fix of themes` interactions