Updates for Nimbus LAF

Pull request for #2668.