LPS-37425

Hey Nate. I send you this PR as you are marked as the leader of the theme development component. Thanks