Theme update

File names, demo integration