Revert to Jekyll standard setup

- Also clean up layout and link colors