STS-3599: Yet more L&F, Updates work, Removed bad dependency.