Implemented theming as in #31