Theme support extended