Update configuration to latest best practice
Update components and cleanup settings