Merge "Merge toast frame assets, update themes, etc. accordingly" into klp-dev