Updated Themes to use property files