Add theme and remove/update methods