Loading and theme bug fix