Changed to use LinkedHashSet to keep unique and keep order
Moved theme values after variables set in screens so that themes override apps and not vice-versa