Store and theme bug fix