Trying to simplify theme as much as possible.

This is where this is going.