MOBILE-605: More variables added for theming