Restructured theme-support