fix double mixup with theme settings

TRDS referred to CM, and vice versa - it was a total mess.
Named theme_settings to cm_theme_settings for cm, just theme_settings for TRDS.
also wrong ids in settings_headers. Ugh.

Change-Id: I9974b25b881ae5faaf7e20da65978a635b5f4917