Revert "More weird merge stuff"

This reverts commit 6b6fe2c854536efe70259a95eaa41d0f0b3c22c6, reversing
changes made to 01c3755a7f4051502efff69ec715a524bb5aee14.

Conflicts:
	style.css
Going back to what I hope was a good commit.