Split into different environments per OS, and add more aliases