Jay's changes to allow mixing mobile/desktop custom/standard themes.

Needed to support mobile standard, even with custom desktop