Futher Toast replacements

Just some new Toast replacements.