move some stuff to base theme