[TECHNICAL SUPPORT] LPS-32581 When changing a theme for a layout set the color scheme selection propagates inconsistently into DB

Hi Iliyan,

I've refactored the code based on your comment in https://github.com/ipeychev/liferay-portal/pull/123

Please review my changes.

Thank you.