Adapt to new themes dir