Add more muxes and cleanup aliases
More muxes