Feature/add theme support

feature relies on feature/ruby2.1 with working tests.