Simplified and fixed confix files