#158 Theme has to shift together with update