Cleanup: Separate decor and material light decoration definitions