Add R.Gen theme support