Regarding the amount of files (CSS +JS) loaded. We will minimize this when we will remove the old theme, which is still there, behind the scenes.