More subtle page/sidebar border colours

- Use standard variable names where equal