updated themes folder structure