Mac: Added GlobalTheme.
Mac: More namespace refactoring.

Related to issue #381.
Missing file from last check-in.