Stylesheet reorganisation #2