Transparent outsets istead of removing for nicer transitions.
Replaced some @ifs with if() syntax.