LRDOCS-466 6.1.x - Themes update backport

These are ready for 6.1.x. Thanks.

@codyhoag