Added theme chooser and images - removed BlackListUtils