Refactored room theming