fixing recursivity of themes