moved components to theme files