Started adding in themes functionality