Merging themes and features...