Added Theme support