Merge categories into source file
Clean up demo