Fixed ApplyStyle issues

Also simplified machine configuration