LPS-38199

Submitting again cloning the ThemeDisplay to avoid changing the original and fixing a few other minor things