master: more themeing, getting closer