XML skin & config, menu updates, cleanup