Removes some intelligent grouping in the code. Perhaps normalization can be selectively done to the the strings and theme files at some point.

Gitlab: #1059
Change-Id: If9b0363567bc715dca0bdb4e3662612a5b159361