LPS-30329 Keep theme settings for default layouts