Feature/add theme support

relies on the 2.1 branch with working tests