fixes for room theming