themes almost working!