Better changing and labelling of themes