started to add some theme management