[FIX] Fixed to the new way of inheritance on themes